Merge "Improve the release of predict_back animaton leash" into main (ccc48a93) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationRunner.java

+41 −11

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import android.util.Log;
		import android.view.IRemoteAnimationFinishedCallback;
		import android.view.IRemoteAnimationRunner;
		import android.view.RemoteAnimationTarget;
		import android.view.SurfaceControl;
		import android.window.IBackAnimationRunner;
		import android.window.IOnBackInvokedCallback;

		@@ -34,6 +35,8 @@ import com.android.internal.jank.Cuj.CujType;
		import com.android.internal.jank.InteractionJankMonitor;
		import com.android.wm.shell.shared.annotations.ShellMainThread;

		import java.lang.ref.WeakReference;

		/**
		* Used to register the animation callback and runner, it will trigger result if gesture was finish
		* before it received IBackAnimationRunner#onAnimationStart, so the controller could continue
		@@ -101,6 +104,40 @@ public class BackAnimationRunner {
		return mCallback;
		}

		private Runnable mFinishedCallback;
		private RemoteAnimationTarget[] mApps;
		private IRemoteAnimationFinishedCallback mRemoteCallback;

		private static class RemoteAnimationFinishedStub extends IRemoteAnimationFinishedCallback.Stub {
		//the binder callback should not hold strong reference to it to avoid memory leak.
		private WeakReference<BackAnimationRunner> mRunnerRef;

		private RemoteAnimationFinishedStub(BackAnimationRunner runner) {
		mRunnerRef = new WeakReference<>(runner);
		}

		@Override
		public void onAnimationFinished() {
		BackAnimationRunner runner = mRunnerRef.get();
		if (runner == null) {
		return;
		}
		if (runner.shouldMonitorCUJ(runner.mApps)) {
		InteractionJankMonitor.getInstance().end(runner.mCujType);
		}

		runner.mFinishedCallback.run();
		for (int i = runner.mApps.length - 1; i >= 0; --i) {
		SurfaceControl sc = runner.mApps[i].leash;
		if (sc != null && sc.isValid()) {
		sc.release();
		}
		}
		runner.mApps = null;
		runner.mFinishedCallback = null;
		}
		}

		/**
		* Called from {@link IBackAnimationRunner}, it will deliver these
		* {@link RemoteAnimationTarget}s to the corresponding runner.
		@@ -108,16 +145,9 @@ public class BackAnimationRunner {
		void startAnimation(RemoteAnimationTarget[] apps, RemoteAnimationTarget[] wallpapers,
		RemoteAnimationTarget[] nonApps, Runnable finishedCallback) {
		InteractionJankMonitor interactionJankMonitor = InteractionJankMonitor.getInstance();
		final IRemoteAnimationFinishedCallback callback =
		new IRemoteAnimationFinishedCallback.Stub() {
		@Override
		public void onAnimationFinished() {
		if (shouldMonitorCUJ(apps)) {
		interactionJankMonitor.end(mCujType);
		}
		finishedCallback.run();
		}
		};
		mFinishedCallback = finishedCallback;
		mApps = apps;
		if (mRemoteCallback == null) mRemoteCallback = new RemoteAnimationFinishedStub(this);
		mWaitingAnimation = false;
		if (shouldMonitorCUJ(apps)) {
		interactionJankMonitor.begin(
		@@ -125,7 +155,7 @@ public class BackAnimationRunner {
		}
		try {
		getRunner().onAnimationStart(TRANSIT_OLD_UNSET, apps, wallpapers,
		nonApps, callback);
		nonApps, mRemoteCallback);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed call onAnimationStart", e);
		}