Merge "Fix issue with settings launch animation" into rvc-dev am: 36eb8c05dc... (8a75387a) · Commits · e / os / android_frameworks_base

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

+0 −4

Original line number	Diff line number	Diff line
		@@ -168,7 +168,6 @@ class ActivityStarter {

		// The task display area to launch the activity onto, barring any strong reason to do otherwise.
		private TaskDisplayArea mPreferredTaskDisplayArea;
		// The windowing mode to apply to the root task, if possible
		private int mPreferredWindowingMode;

		private Task mInTask;
		@@ -1560,9 +1559,6 @@ class ActivityStarter {
		if (!mAvoidMoveToFront && mDoResume) {
		mTargetStack.getStack().moveToFront("reuseOrNewTask", targetTask);
		if (mOptions != null) {
		if (mPreferredWindowingMode != WINDOWING_MODE_UNDEFINED) {
		mTargetStack.setWindowingMode(mPreferredWindowingMode);
		}
		if (mOptions.getTaskAlwaysOnTop()) {
		mTargetStack.setAlwaysOnTop(true);
		}