commit a956e72a0bb62a05a8b54beec3187c596fb92cee
author Wei Sheng Shih <wilsonshih@google.com> Fri Jun 14 02:56:27 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 14 02:56:27 2024 +0000
tree 3f14778016aed3b35c0727b31fb3a24a7d97ab88
parent 7a4fbc01bc0891c7be4ef43c096c0e902c441665
parent bec9dd44d02b6745f7513591ef8b9a4445f9edaf

Merge "Specific release windowless surface in core." into main

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

diff --git a/services/core/java/com/android/server/wm/BackNavigationController.java b/services/core/java/com/android/server/wm/BackNavigationController.java
index 0febec9..2972190 100644
--- a/services/core/java/com/android/server/wm/BackNavigationController.java
+++ b/services/core/java/com/android/server/wm/BackNavigationController.java
@@ -1366,8 +1366,6 @@
                                         ? task.getSurfaceControl()
                                         : mAdaptors[0].mTarget.getSurfaceControl());
                     }
-                    // remove starting surface.
-                    mStartingSurface = null;
                 }
             }
 
@@ -1384,7 +1382,10 @@
                         .removeWindowlessStartingSurface(mRequestedStartingSurfaceId,
                                 !openTransitionMatch);
                 mRequestedStartingSurfaceId = INVALID_TASK_ID;
-                mStartingSurface = null;
+                if (mStartingSurface != null && mStartingSurface.isValid()) {
+                    mStartingSurface.release();
+                    mStartingSurface = null;
+                }
             }
         }