commit 2453d06524bcdbc4c4a9ef7cfb15a76e4e31929b
author Louis Chang <louischang@google.com> Tue Nov 19 22:30:48 2019 +0800
committer Louis Chang <louischang@google.com> Wed Dec 04 14:25:35 2019 +0800
tree c373326a65a252a179d7388b2dedb89448eff35d
parent 6ab3ba5cea6ebd0cba94b3236295d44901de55b4

Unify Display level of window hierarchy (74/n)

Bug: 80414790
Bug: 144775502
Test: Existing tests pass
Change-Id: I041a64d001e09761b6c72dcc5acd3b6ca5b287c8

services/core/java/com/android/server/wm/KeyguardController.java

diff --git a/services/core/java/com/android/server/wm/KeyguardController.java b/services/core/java/com/android/server/wm/KeyguardController.java
index 7645de5..318d88e 100644
--- a/services/core/java/com/android/server/wm/KeyguardController.java
+++ b/services/core/java/com/android/server/wm/KeyguardController.java
@@ -531,8 +531,8 @@
          * occlusion state.
          */
         private ActivityStack getStackForControllingOccluding(ActivityDisplay display) {
-            for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
-                final ActivityStack stack = display.getChildAt(stackNdx);
+            for (int stackNdx = display.getStackCount() - 1; stackNdx >= 0; --stackNdx) {
+                final ActivityStack stack = display.getStackAt(stackNdx);
                 if (stack != null && stack.isFocusableAndVisible()
                         && !stack.inPinnedWindowingMode()) {
                     return stack;