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

Commit a46e7df7 authored by Riddle Hsu's avatar Riddle Hsu
Browse files

Avoid unnecessary warning log of sleep token 

The updateKeyguardSleepToken can be called multiple times. e.g.
keyguardGoingAway and then setKeyguardShown. Then the sleep token
was removed by the first call. And the second call will always
print a warning: "Remove non-existent sleep token"

Bug: 423701190
Flag: EXEMPT skip warning log
Test: presubmit
Change-Id: Ib5f2f7241263fe19c0b85f5cf888509702a71ec1
parent aa878a5a

services/core/java/com/android/server/wm/KeyguardController.java

+4 −2
Original line number Diff line number Diff line
@@ -590,7 +590,7 @@ class KeyguardController { 
    private void updateKeyguardSleepToken(DisplayContent display) {

        if (isKeyguardUnoccludedOrAodShowing(display.mDisplayId)) {

            display.addSleepToken(KEYGUARD_SLEEP_TOKEN_TAG);

        } else {

        } else if (display.hasSleepToken(KEYGUARD_SLEEP_TOKEN_TAG)) {

            display.removeSleepToken(KEYGUARD_SLEEP_TOKEN_TAG);

        }

    }
@@ -710,8 +710,10 @@ class KeyguardController { 
            mTopOccludesActivity = null;

            mDismissingKeyguardActivity = null;

            mTopTurnScreenOnActivity = null;

            if (dc.hasSleepToken(KEYGUARD_SLEEP_TOKEN_TAG)) {

                dc.removeSleepToken(KEYGUARD_SLEEP_TOKEN_TAG);

            }

        }



        void writeEventLog(String reason) {

            EventLogTags.writeWmSetKeyguardShown(