Merge "Specific release windowless surface in core." into main (a956e72a) · Commits · e / os / android_frameworks_base

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

+4 −3

Original line number	Diff line number	Diff line
		@@ -1366,8 +1366,6 @@ class BackNavigationController {
		? task.getSurfaceControl()
		: mAdaptors[0].mTarget.getSurfaceControl());
		}
		// remove starting surface.
		mStartingSurface = null;
		}
		}

		@@ -1384,9 +1382,12 @@ class BackNavigationController {
		.removeWindowlessStartingSurface(mRequestedStartingSurfaceId,
		!openTransitionMatch);
		mRequestedStartingSurfaceId = INVALID_TASK_ID;
		if (mStartingSurface != null && mStartingSurface.isValid()) {
		mStartingSurface.release();
		mStartingSurface = null;
		}
		}
		}

		private static class BackWindowAnimationAdaptor implements AnimationAdapter {
		SurfaceControl mCapturedLeash;