Merge "Don't run AttentionDetector when wakelock is held" into qt-dev

am: ed8620ae02 Change-Id: I0e6767143f3f7c0bedc90a15400055a062c3c90f
2019-05-28 22:09:29 -07:00
parent 279e47ff19 ed8620ae02
commit 7ba03c7f76
1 changed files with 2 additions and 1 deletions
--- 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);
                }