From 22bbc359968895ae00cfeecc584b0ef8da24dc92 Mon Sep 17 00:00:00 2001
From: Issei Suzuki <issei@google.com>
Date: Tue, 8 Feb 2022 13:58:16 +0000
Subject: [PATCH] Ignore duplicate keyguardGoingAway request.

SysUI calls ActivityTaskManager#keyguardGoingAway to start keyguard
going away process. In case SysUI calls the binder call again while
keyguard is going away, ActivityTaskManager ignores it.

Bug: 215201490
Test: atest KeyguardTransitionTests
Change-Id: Iaee8c7cd25f0a89c5e90bd6fc0185dd54fb1d99e
---
 .../core/java/com/android/server/wm/KeyguardController.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/KeyguardController.java b/services/core/java/com/android/server/wm/KeyguardController.java
index 5c8502b830c16..c55af9b6286ea 100644
--- 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");