From 9e24223a5549c3d5f580a97630a6395fe4d4821f Mon Sep 17 00:00:00 2001 From: Alex Salo Date: Tue, 14 May 2019 19:27:17 -0700 Subject: Don't run AttentionDetector when wakelock is held There is no need since the screen will stay on anyways. Bug: 132587341 Test: manually confirmed the attention detector is not called when youtube app is playing a video Change-Id: I761cabb4af447726471c44e4259739efb2b6a3f0 --- services/core/java/com/android/server/power/PowerManagerService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index e2bbb2dc2dc5..cfd3ae6ef594 100644 --- a/services/core/java/com/android/server/power/PowerManagerService.java +++ b/services/core/java/com/android/server/power/PowerManagerService.java @@ -2085,7 +2085,8 @@ public final class PowerManagerService extends SystemService nextTimeout = -1; } - if ((mUserActivitySummary & USER_ACTIVITY_SCREEN_BRIGHT) != 0) { + if ((mUserActivitySummary & USER_ACTIVITY_SCREEN_BRIGHT) != 0 + && (mWakeLockSummary & WAKE_LOCK_STAY_AWAKE) == 0) { nextTimeout = mAttentionDetector.updateUserActivity(nextTimeout); } -- cgit v1.2.3-59-g8ed1b