Merge "Ignore duplicate keyguardGoingAway request."

2022-02-09 10:10:13 +00:00
parent 93e1fd4c0b 22bbc35996
commit d8c1cfaa34
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/KeyguardController.java
+++ b/services/core/java/com/android/server/wm/KeyguardController.java
@@ -235,7 +235,7 @@ class KeyguardController {
     */
    void keyguardGoingAway(int displayId, int flags) {
        final KeyguardDisplayState state = getDisplayState(displayId);
-        if (!state.mKeyguardShowing) {
+        if (!state.mKeyguardShowing || state.mKeyguardGoingAway) {
            return;
        }
        Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "keyguardGoingAway");