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

Commit 0d2ab658 authored by Alex Salo's avatar Alex Salo Committed by Automerger Merge Worker
Browse files

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

Merge "Fix Screen Attention reporting ABSENT twice" into rvc-dev am: d53e8618 am: 134eb2cf am: 5570c068

Change-Id: I04d89a986e11697bf451b8ecebf33b298d799cb2
parents d69e05a5 5570c068

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