Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alex Salo
2020-04-16 21:36:53 +00:00
committed by Android (Google) Code Review
parent fb9a191710 aa82051811
commit d53e8618cc
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/power/PowerManagerService.java
View File

@@ -2338,8 +2338,7 @@ public final class PowerManagerService extends SystemService
nextTimeout = -1; nextTimeout = -1;
} }
if (((mUserActivitySummary & USER_ACTIVITY_SCREEN_BRIGHT) != 0 if ((mUserActivitySummary & USER_ACTIVITY_SCREEN_BRIGHT) != 0
|| (mUserActivitySummary & USER_ACTIVITY_SCREEN_DIM) != 0)
&& (mWakeLockSummary & WAKE_LOCK_STAY_AWAKE) == 0) { && (mWakeLockSummary & WAKE_LOCK_STAY_AWAKE) == 0) {
nextTimeout = mAttentionDetector.updateUserActivity(nextTimeout, nextTimeout = mAttentionDetector.updateUserActivity(nextTimeout,
screenDimDuration); screenDimDuration);