diff options
| author | 2019-05-29 04:56:52 +0000 | |
|---|---|---|
| committer | 2019-05-29 04:56:52 +0000 | |
| commit | ed8620ae022e63fe85e2ddce4114e49457163a77 (patch) | |
| tree | a0460feff726947f5d2ce4cc3bb2738339641689 | |
| parent | 8f5770a0b39db7dadaf84a4fd0d4ba6094247336 (diff) | |
| parent | 9e24223a5549c3d5f580a97630a6395fe4d4821f (diff) | |
Merge "Don't run AttentionDetector when wakelock is held" into qt-dev
| -rw-r--r-- | services/core/java/com/android/server/power/PowerManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
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); } |