From d5881d71fdd599475baa25ea577347f390c6a7dc Mon Sep 17 00:00:00 2001 From: Lais Andrade Date: Wed, 20 May 2020 12:44:16 +0100 Subject: [PATCH] Fix wrong use of power mode over power boost The removal of PowerHint from the PowerManagerService api in ag/10891954 replaced the PowerHint.INTERACTION with the wrong Mode.INTERACTIVE instead of Boost.INTERACTION here: Before the cl: https://googleplex-android.git.corp.google.com/platform/frameworks/base/+/6d692090226b0548cdb69056c12a61039a5d8e90/services/core/java/com/android/server/power/PowerManagerService.java#1614 After the cl: https://source.corp.google.com/android/frameworks/base/services/core/java/com/android/server/power/PowerManagerService.java;l=1592;bpv=1;bpt=0;rcl=71d90a685690cc15a16c58e2b21a79935fb15db1 Fix: 157013347 Test: atest FrameworksServicesTests:PowerManagerServiceTest Change-Id: I25535df17c5fc5717a5918d7c32fe6503d24551c --- .../java/com/android/server/power/PowerManagerService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index 1db71bb5b61a9..4c4680b173726 100644 --- a/services/core/java/com/android/server/power/PowerManagerService.java +++ b/services/core/java/com/android/server/power/PowerManagerService.java @@ -44,6 +44,7 @@ import android.hardware.SystemSensorManager; import android.hardware.display.AmbientDisplayConfiguration; import android.hardware.display.DisplayManagerInternal; import android.hardware.display.DisplayManagerInternal.DisplayPowerRequest; +import android.hardware.power.Boost; import android.hardware.power.Mode; import android.net.Uri; import android.os.BatteryManager; @@ -321,7 +322,7 @@ public final class PowerManagerService extends SystemService private long mLastUserActivityTime; private long mLastUserActivityTimeNoChangeLights; - // Timestamp of last time power mode was set to interactive. + // Timestamp of last time power boost interaction was sent. private long mLastInteractivePowerHintTime; // Timestamp of the last screen brightness boost. @@ -1589,7 +1590,7 @@ public final class PowerManagerService extends SystemService Trace.traceBegin(Trace.TRACE_TAG_POWER, "userActivity"); try { if (eventTime > mLastInteractivePowerHintTime) { - setPowerModeInternal(Mode.INTERACTIVE, false); + setPowerBoostInternal(Boost.INTERACTION, 0); mLastInteractivePowerHintTime = eventTime; }