commit 1330ec333735809fb3c38e4a1622b56bfe453cab
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Oct 21 04:51:04 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 21 04:51:04 2024 +0000
tree 08dbc3a2a647359b61b017ea9c83e8522d6458b6
parent 7a6864f3a1dcff4b688beada30b5e17d269f58a7
parent ac54d3cccaa79b768d8b4fad9d7737fcee5d7d2f

Merge "Remove StartingWindow or cancel the request to add StartingWindow after all activities have been drawn" into main

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

diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index a076cf6..3bca2d8 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -6960,7 +6960,7 @@
         } else if (associatedTask.getActivity(
                 r -> r.isVisibleRequested() && !r.firstWindowDrawn) == null) {
             // The last drawn activity may not be the one that owns the starting window.
-            final ActivityRecord r = associatedTask.topActivityContainsStartingWindow();
+            final ActivityRecord r = associatedTask.getActivity(ar -> ar.mStartingData != null);
             if (r != null) {
                 r.removeStartingWindow();
             }