power-libperfmgr: remove Google-specific display LPM control

Change-Id: If58f38b99bf6fbd73f6b6ab2144293c63e18b600
Signed-off-by: Jesse Chan <jc@lineageos.org>

diff --git a/hidl/power-libperfmgr/Android.bp b/hidl/power-libperfmgr/Android.bp
index e13140d37be034b703b9268f81546b263665cbbd..e3d80467104b8437faa2b57b500bec1d6e7d0fd4 100644 (file)
--- a/hidl/power-libperfmgr/Android.bp
+++ b/hidl/power-libperfmgr/Android.bp
@@ -24,8 +24,7 @@ cc_binary {
     relative_install_path: "hw",
     vintf_fragments: ["android.hardware.power@1.3-service.samsung.xml"],
     init_rc: ["android.hardware.power@1.3-service.samsung-libperfmgr.rc"],
-    srcs: ["service.cpp", "Power.cpp", "InteractionHandler.cpp",
-            "display-helper.cpp"],
+    srcs: ["service.cpp", "Power.cpp", "InteractionHandler.cpp"],
     cflags: [
         "-Wall",
         "-Werror",

diff --git a/hidl/power-libperfmgr/Power.cpp b/hidl/power-libperfmgr/Power.cpp
index a0c130808e9dda5609b1981edbca6e722bdc1422..150b1aaafe944c240bbc79638765c829da8631f9 100644 (file)
--- a/hidl/power-libperfmgr/Power.cpp
+++ b/hidl/power-libperfmgr/Power.cpp
@@ -30,7 +30,6 @@
 
 #include "AudioStreaming.h"
 #include "Power.h"
-#include "display-helper.h"
 
 namespace android {
 namespace hardware {
@@ -198,13 +197,6 @@ Return<void> Power::powerHint(PowerHint_1_0 hint, int32_t data) {
             }
             break;
         case PowerHint_1_0::LOW_POWER:
-            if (data) {
-                // Device in battery saver mode, enable display low power mode
-                set_display_lpm(true);
-            } else {
-                // Device exiting battery saver mode, disable display low power mode
-                set_display_lpm(false);
-            }
             break;
         default:
             break;

diff --git a/hidl/power-libperfmgr/display-helper.cpp b/hidl/power-libperfmgr/display-helper.cpp
deleted file mode 100644 (file)
index 76154bc..0000000
--- a/hidl/power-libperfmgr/display-helper.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_NIDEBUG 0
-#define LOG_TAG "android.hardware.power@1.3-service.samsung-libperfmgr"
-
-#include <dlfcn.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include <cutils/sockets.h>
-#include <log/log.h>
-
-#include "display-helper.h"
-
-#define DAEMON_SOCKET "pps"
-
-static int daemon_socket = -1;
-
-static int connectPPDaemon() {
-    // Setup socket connection, if not already done.
-    if (daemon_socket < 0)
-        daemon_socket =
-                socket_local_client(DAEMON_SOCKET, ANDROID_SOCKET_NAMESPACE_RESERVED, SOCK_STREAM);
-
-    if (daemon_socket < 0) {
-        ALOGE("Connecting to socket failed: %s", strerror(errno));
-        return -1;
-    }
-    return 0;
-}
-
-static int ppdComm(const char *cmd) {
-    int ret = -1;
-
-    ret = connectPPDaemon();
-    if (ret < 0)
-        return ret;
-
-    ret = write(daemon_socket, cmd, strlen(cmd));
-    if (ret < 0) {
-        ALOGE("Failed to send data over socket, %s", strerror(errno));
-        return ret;
-    }
-    return 0;
-}
-
-void set_display_lpm(int enable) {
-    ALOGI("set_display_lpm state: %d", enable);
-    if (enable) {
-        ppdComm("foss:on");
-    } else {
-        ppdComm("foss:off");
-    }
-}

diff --git a/hidl/power-libperfmgr/display-helper.h b/hidl/power-libperfmgr/display-helper.h
deleted file mode 100644 (file)
index 70b9697..0000000
--- a/hidl/power-libperfmgr/display-helper.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef POWER_LIBPERFMGR_DISPLAY_HELPER_H_
-#define POWER_LIBPERFMGR_DISPLAY_HELPER_H_
-
-enum display_lpm_state {
-    DISPLAY_LPM_OFF = 0,
-    DISPLAY_LPM_ON,
-    DISPLAY_LPM_UNKNOWN,
-};
-
-void set_display_lpm(int enable);
-
-#endif  // POWER_LIBPERFMGR_DISPLAY_HELPER_H_