Merge "Release leashes which won't be used" into main (31e1a5d1) · Commits · e / os / android_frameworks_base

core/java/android/view/InsetsAnimationThreadControlRunner.java

+1 −7

Original line number	Diff line number	Diff line
		@@ -76,7 +76,7 @@ public class InsetsAnimationThreadControlRunner implements InsetsAnimationContro
		Trace.asyncTraceEnd(Trace.TRACE_TAG_VIEW,
		"InsetsAsyncAnimation: " + WindowInsets.Type.toString(runner.getTypes()),
		runner.getTypes());
		releaseControls(mControl.getControls());
		InsetsController.releaseControls(mControl.getControls());
		mMainThreadHandler.post(() ->
		mOuterCallbacks.notifyFinished(InsetsAnimationThreadControlRunner.this, shown));
		}
		@@ -130,12 +130,6 @@ public class InsetsAnimationThreadControlRunner implements InsetsAnimationContro
		});
		}

		private void releaseControls(SparseArray<InsetsSourceControl> controls) {
		for (int i = controls.size() - 1; i >= 0; i--) {
		controls.valueAt(i).release(SurfaceControl::release);
		}
		}

		@Override
		@UiThread
		public void dumpDebug(ProtoOutputStream proto, long fieldId) {

+9 −0

Original line number	Diff line number	Diff line
		@@ -1353,6 +1353,9 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation
		});
		}

		// The leashes are copied, but they won't be used.
		releaseControls(controls);

		// The requested visibilities should be delayed as well. Otherwise, we might override
		// the insets visibility before playing animation.
		setRequestedVisibleTypes(mReportedRequestedVisibleTypes, types);
		@@ -1422,6 +1425,12 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation
		}
		}

		static void releaseControls(SparseArray<InsetsSourceControl> controls) {
		for (int i = controls.size() - 1; i >= 0; i--) {
		controls.valueAt(i).release(SurfaceControl::release);
		}
		}

		// TODO(b/242962223): Make this setter restrictive.
		@Override
		public void setSystemDrivenInsetsAnimationLoggingListener(