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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-29 04:56:52 +00:00
committed by Android (Google) Code Review
parent 8f5770a0b3 9e24223a55
commit ed8620ae02
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;
}
if ((mUserActivitySummary & USER_ACTIVITY_SCREEN_BRIGHT) != 0) {
if ((mUserActivitySummary & USER_ACTIVITY_SCREEN_BRIGHT) != 0
&& (mWakeLockSummary & WAKE_LOCK_STAY_AWAKE) == 0) {
nextTimeout = mAttentionDetector.updateUserActivity(nextTimeout);
}