Merge "Correctly disposing of LauncherUnlockAnimationController" into udc-dev (60ad6b5a) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/quickstep/SystemUiProxy.java

+7 −21

Original line number	Diff line number	Diff line
		@@ -218,30 +218,16 @@ public class SystemUiProxy implements ISystemUiProxy {
		mUnfoldAnimation = unfoldAnimation;
		linkToDeath();
		// re-attach the listeners once missing due to setProxy has not been initialized yet.
		if (mPipAnimationListener != null && mPip != null) {
		setPipAnimationListener(mPipAnimationListener);
		}
		if (mSplitScreenListener != null && mSplitScreen != null) {
		registerSplitScreenListener(mSplitScreenListener);
		}
		if (mStartingWindowListener != null && mStartingWindow != null) {
		setStartingWindowListener(mStartingWindowListener);
		}
		if (mSysuiUnlockAnimationController != null && mLauncherUnlockAnimationController != null) {
		setLauncherUnlockAnimationController(mLauncherUnlockAnimationController);
		}
		new LinkedHashMap<>(mRemoteTransitions).forEach(this::registerRemoteTransition);
		setupTransactionQueue();
		if (mRecentTasksListener != null && mRecentTasks != null) {
		registerRecentTasksListener(mRecentTasksListener);
		}
		if (mBackAnimation != null && mBackToLauncherCallback != null) {
		setBackToLauncherCallback(mBackToLauncherCallback, mBackToLauncherRunner);
		}
		if (unfoldAnimation != null && mUnfoldAnimationListener != null) {
		setUnfoldAnimationListener(mUnfoldAnimationListener);
		}
		}

		public void clearProxy() {
		setProxy(null, null, null, null, null, null, null, null, null, null, null);