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 am: d53e8618cc am: 134eb2cf6a

Browse Source 
Change-Id: Ic4022ad3b8db397e95e93eee2a6a888cc5e87d5d
This commit is contained in:
Alex Salo
2020-04-16 21:48:46 +00:00
committed by Automerger Merge Worker
parent 857870074e 134eb2cf6a
commit 5570c06809
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);