diff --git a/services/core/java/com/android/server/wm/TaskDisplayArea.java b/services/core/java/com/android/server/wm/TaskDisplayArea.java
index 3360951a8f3fc..205a8d2aeeac0 100644
--- a/services/core/java/com/android/server/wm/TaskDisplayArea.java
+++ b/services/core/java/com/android/server/wm/TaskDisplayArea.java
@@ -1746,10 +1746,15 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> {
 
     void ensureActivitiesVisible(ActivityRecord starting, int configChanges,
             boolean preserveWindows, boolean notifyClients) {
-        for (int stackNdx = getStackCount() - 1; stackNdx >= 0; --stackNdx) {
-            final ActivityStack stack = getStackAt(stackNdx);
-            stack.ensureActivitiesVisible(starting, configChanges, preserveWindows,
-                    notifyClients);
+        mAtmService.mStackSupervisor.beginActivityVisibilityUpdate();
+        try {
+            for (int stackNdx = getStackCount() - 1; stackNdx >= 0; --stackNdx) {
+                final ActivityStack stack = getStackAt(stackNdx);
+                stack.ensureActivitiesVisible(starting, configChanges, preserveWindows,
+                        notifyClients);
+            }
+        } finally {
+            mAtmService.mStackSupervisor.endActivityVisibilityUpdate();
         }
     }