Commit b2c0d58c authored Oct 21, 2024 by Treehugger Robot Committed by Automerger Merge Worker Oct 21, 2024

Merge "Remove StartingWindow or cancel the request to add StartingWindow after...

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

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>

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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();
		}