Merge "Null out Activity in split controller" into udc-qpr-dev (09892161) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -471,6 +471,10 @@ public class QuickstepLauncher extends Launcher {
		mDesktopVisibilityController.unregisterSystemUiListener();
		}

		if (mSplitSelectStateController != null) {
		mSplitSelectStateController.onDestroy();
		}

		super.onDestroy();
		mHotseatPredictionController.destroy();
		mSplitWithKeyboardShortcutController.onDestroy();

+1 −1

Original line number	Diff line number	Diff line
		@@ -393,7 +393,7 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
		super.onDestroy();
		ACTIVITY_TRACKER.onActivityDestroyed(this);
		mActivityLaunchAnimationRunner = null;

		mSplitSelectStateController.onDestroy();
		mTISBindHelper.onDestroy();
		}

+5 −1

Original line number	Diff line number	Diff line
		@@ -113,7 +113,7 @@ import java.util.function.Consumer;
		public class SplitSelectStateController {
		private static final String TAG = "SplitSelectStateCtor";

		private final Context mContext;
		private Context mContext;
		private final Handler mHandler;
		private final RecentsModel mRecentTasksModel;
		private final SplitAnimationController mSplitAnimationController;
		@@ -157,6 +157,10 @@ public class SplitSelectStateController {
		mSplitSelectDataHolder = new SplitSelectDataHolder(mContext);
		}

		public void onDestroy() {
		mContext = null;
		}

		/**
		* @param alreadyRunningTask if set to {@link android.app.ActivityTaskManager#INVALID_TASK_ID}
		* then @param intent will be used to launch the initial task