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

Commit b326363d 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

Change-Id: I28b9770a60a5ddbcc44449401e078c2dc651a0e2
parents ed0cd48e ed8620ae

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);

                }