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

Commit 3b46bcdb authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Fix Screen Attention reporting ABSENT twice" into rvc-dev am:... 

Merge "Merge "Fix Screen Attention reporting ABSENT twice" into rvc-dev am: d53e8618 am: 134eb2cf" into rvc-d1-dev-plus-aosp am: 5c6ab3f6

Change-Id: Id0eb4f892e1408b45ffa11859cb167a8dcacc0cb
parents fe3171b9 5c6ab3f6

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

+1 −2
Original line number Diff line number Diff line
@@ -2338,8 +2338,7 @@ public final class PowerManagerService extends SystemService 
                    nextTimeout = -1;

                }



                if (((mUserActivitySummary & USER_ACTIVITY_SCREEN_BRIGHT) != 0

                        || (mUserActivitySummary & USER_ACTIVITY_SCREEN_DIM) != 0)

                if ((mUserActivitySummary & USER_ACTIVITY_SCREEN_BRIGHT) != 0

                        && (mWakeLockSummary & WAKE_LOCK_STAY_AWAKE) == 0) {

                    nextTimeout = mAttentionDetector.updateUserActivity(nextTimeout,

                            screenDimDuration);