Merge "Ensure client side starting window get removed when remove all windows" into main (b4397c29) · Commits · e / os / android_frameworks_base

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -7538,6 +7538,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		if (mStartingWindow == win) {
		// This could only happen when the window is removed from hierarchy. So do not keep its
		// reference anymore.
		if (mStartingSurface != null) {
		// Ensure the reference in client side can be removed.
		mStartingSurface.remove(false /* animate /, false / hasImeSurface */);
		}
		mStartingWindow = null;
		mStartingData = null;
		mStartingSurface = null;