Merge "Ensure client side starting window get removed when remove all windows" into main
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index b256502..0bd8441 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -7538,6 +7538,10 @@
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;