| commit | 067646f5a2b7f0f068d8d65dc6d70db4abd37629 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Oct 21 05:34:16 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 21 05:34:16 2024 +0000 |
| tree | d14956559a445e85c28e2678ad28ef52c69e9683 | |
| parent | 7b7eb9946f8f9c1abb9e1064b3b79b74dbdccd52 [diff] | |
| parent | b2c0d58c05e655f9f01958af30acca88bfbadb4f [diff] |
Merge "Remove StartingWindow or cancel the request to add StartingWindow after all activities have been drawn" into main am: 1330ec3337 am: b2c0d58c05 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3311295 Change-Id: Ida4743c9620237fad068a08608a4ad31fbf51394 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index d4dccc3..054f931 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -6853,7 +6853,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(); }