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

Commit 512b3de3 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Avoid unnecessary warning log of sleep token" into main

parents e3dc46d7 a46e7df7

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(