Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62d1f46c authored by Alex Salo's avatar Alex Salo Committed by android-build-merger
Browse files

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

am: fc2edf98

Change-Id: I22abc65b507ee22500977b15d7f4c54a73447836
parents 90d3ac1f fc2edf98

services/core/java/com/android/server/power/PowerManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -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);

                }