Merge "Update occludes keyguard status for all stacks." into rvc-dev

2020-04-23 13:30:30 +00:00
parent 0f45d14519 9720ca224a
commit 9ccee07a31
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -2677,7 +2677,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 */);
        }