From 9e9ba0a5b8571af4d0ead568d6f998a447e432a0 Mon Sep 17 00:00:00 2001 From: Jesse Chan Date: Sat, 13 Jun 2020 12:06:26 +0800 Subject: [PATCH] power-libperfmgr: remove Google-specific display LPM control Change-Id: If58f38b99bf6fbd73f6b6ab2144293c63e18b600 Signed-off-by: Jesse Chan --- hidl/power-libperfmgr/Android.bp | 3 +- hidl/power-libperfmgr/Power.cpp | 8 --- hidl/power-libperfmgr/display-helper.cpp | 74 ------------------------ hidl/power-libperfmgr/display-helper.h | 28 --------- 4 files changed, 1 insertion(+), 112 deletions(-) delete mode 100644 hidl/power-libperfmgr/display-helper.cpp delete mode 100644 hidl/power-libperfmgr/display-helper.h diff --git a/hidl/power-libperfmgr/Android.bp b/hidl/power-libperfmgr/Android.bp index e13140d3..e3d80467 100644 --- 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 a0c13080..150b1aaa 100644 --- 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 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 index 76154bce..00000000 --- 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 -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#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 index 70b96975..00000000 --- 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_