diff options
| author | 2024-10-21 05:14:04 +0000 | |
|---|---|---|
| committer | 2024-10-21 05:14:04 +0000 | |
| commit | b2c0d58c05e655f9f01958af30acca88bfbadb4f (patch) | |
| tree | 987b9905bddbbf868bf738e4c09729ff6347b498 | |
| parent | f7f6d3a45c5dc58372cf786fa404a1d1cc5d5e2c (diff) | |
| parent | 1330ec333735809fb3c38e4a1622b56bfe453cab (diff) | |
Merge "Remove StartingWindow or cancel the request to add StartingWindow after all activities have been drawn" into main am: 1330ec3337
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3311295
Change-Id: Ieb96b98b54150688cb596187fcd0e250dbd881e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityRecord.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index a076cf6bf6ab..3bca2d8e9957 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 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A } 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(); } |