Merge "Don't run AttentionDetector when wakelock is held" into qt-dev am: ed8620ae02 am: b326363d94

am: fc2edf9847 Change-Id: I22abc65b507ee22500977b15d7f4c54a73447836
2019-05-28 22:20:53 -07:00
parent 90d3ac1f9c fc2edf9847
commit 62d1f46c31
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);
                }