From f54971abe43c3db31edcf12c6d527ef817508b29 Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Wed, 18 Jan 2017 22:36:23 +0000 Subject: [PATCH] Remove PowerHint::DISABLE_TOUCH This isn't really a power hint and doesn't given the opportunity for the input system to clean up any on going input streams or input fusion, so shouldn't be part of the power HAL. Test: run vts, play with device Bug: 30143923 Change-Id: I7b63a2f07a7851739d90099af45773acead58548 --- power/1.0/types.hal | 9 --------- power/1.0/vts/functional/power_hidl_hal_test.cpp | 2 +- power/1.0/vts/types.vts | 4 ---- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/power/1.0/types.hal b/power/1.0/types.hal index c27242ec..debdc357 100644 --- a/power/1.0/types.hal +++ b/power/1.0/types.hal @@ -76,15 +76,6 @@ enum PowerHint : uint32_t { * it has been launched. */ LAUNCH = 0x00000008, - - /* - * When device enters some special modes, e.g. theater mode in Android - * Wear, there is no touch interaction expected between device and user. - * Touch controller could be disabled in those modes to save power. - * The data parameter is non-zero when touch could be disabled, and zero - * when touch needs to be re-enabled. - */ - DISABLE_TOUCH = 0x00000009 }; enum Feature : uint32_t { diff --git a/power/1.0/vts/functional/power_hidl_hal_test.cpp b/power/1.0/vts/functional/power_hidl_hal_test.cpp index 36bdb0af..635b69e4 100644 --- a/power/1.0/vts/functional/power_hidl_hal_test.cpp +++ b/power/1.0/vts/functional/power_hidl_hal_test.cpp @@ -62,7 +62,7 @@ TEST_F(PowerHidlTest, PowerHint) { PowerHint::VIDEO_ENCODE, PowerHint::VIDEO_DECODE, PowerHint::LOW_POWER, PowerHint::SUSTAINED_PERFORMANCE, PowerHint::VR_MODE, PowerHint::LAUNCH, - PowerHint::DISABLE_TOUCH, badHint}; + badHint}; Return ret; for (auto hint : hints) { ret = power->powerHint(hint, 1); diff --git a/power/1.0/vts/types.vts b/power/1.0/vts/types.vts index 94c003bc..57249465 100644 --- a/power/1.0/vts/types.vts +++ b/power/1.0/vts/types.vts @@ -43,10 +43,6 @@ attribute: { scalar_value: { uint32_t: 8 } - enumerator: "DISABLE_TOUCH" - scalar_value: { - uint32_t: 9 - } } } -- 2.11.0