From 9720ca224af5c5c36c209ae851825ea143d6522b Mon Sep 17 00:00:00 2001
From: wilsonshih <wilsonshih@google.com>
Date: Wed, 22 Apr 2020 12:11:28 +0800
Subject: [PATCH] Update occludes keyguard status for all stacks.

When finishing current occluded activity, we should also consider to
update the mTopActivityOccludesKeyguard for all stacks, otherwise the
next occluded status might be wrong.

Bug: 154334456
Test: atest KeyguardTests
Change-Id: Id8253eb97581a9dd52ab748117d9cd4cc63a206d
---
 services/core/java/com/android/server/wm/ActivityRecord.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index e76eda06d2d3c..78810a91137f2 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -2672,7 +2672,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
         if (isState(PAUSED)
                 && mStackSupervisor.getKeyguardController().isKeyguardLocked()
                 && getStack().topActivityOccludesKeyguard()) {
-            getStack().ensureActivitiesVisible(null /* starting */, 0 /* configChanges */,
+            getDisplay().ensureActivitiesVisible(null /* starting */, 0 /* configChanges */,
                     false /* preserveWindows */, false /* notifyClients */);
         }