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

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

Browse Source 
am: b326363d94

Change-Id: Iffe2e9673b3de295412bb882d893f84fca524040
This commit is contained in:
Alex Salo
2019-05-28 22:14:26 -07:00
committed by android-build-merger
parent 94868075fb b326363d94
commit fc2edf9847
1 changed files with 2 additions and 1 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

@@ -2085,7 +2085,8 @@ public final class PowerManagerService extends SystemService
nextTimeout = -1; 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); nextTimeout = mAttentionDetector.updateUserActivity(nextTimeout);
} }