Merge "Fix Screen Attention reporting ABSENT twice" into rvc-dev

2020-04-16 21:36:53 +00:00
parent fb9a191710 aa82051811
commit d53e8618cc
1 changed files with 1 additions and 2 deletions
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -2338,8 +2338,7 @@ public final class PowerManagerService extends SystemService
                    nextTimeout = -1;
                }

-                if (((mUserActivitySummary & USER_ACTIVITY_SCREEN_BRIGHT) != 0
-                        || (mUserActivitySummary & USER_ACTIVITY_SCREEN_DIM) != 0)
+                if ((mUserActivitySummary & USER_ACTIVITY_SCREEN_BRIGHT) != 0
                        && (mWakeLockSummary & WAKE_LOCK_STAY_AWAKE) == 0) {
                    nextTimeout = mAttentionDetector.updateUserActivity(nextTimeout,
                            screenDimDuration);