Commit cee57881 authored Apr 16, 2021 by Wale Ogunwale Committed by android-build-team Robot Apr 16, 2021

Revert "Make sure activity is started in requested windowing mode"

Revert "Stop using ATM#setTaskWindowingMode in CTS"

Revert submission 14124672-migrate-ss-set-mode

Reason for revert: b/185192439
Reverted Changes:
I8f3b19b77:Stop using ATM#setTaskWindowingMode in CTS
I43884c329:Make sure activity is started in requested windowi...

Bug: 177190100
Bug: 185192439
Change-Id: I207f135a583f113b849afa28d61096e5385ce514
(cherry picked from commit 6455842a72ff7d23ef0b62f65563bc3eed1096fa)

parent 003525cf

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

+0 −6

Original line number	Diff line number	Diff line
		@@ -2633,12 +2633,6 @@ class ActivityStarter {
		mOptions = null;
		}
		}

		if (mPreferredWindowingMode != WINDOWING_MODE_UNDEFINED
		&& intentTask.getWindowingMode() != mPreferredWindowingMode) {
		intentTask.setWindowingMode(mPreferredWindowingMode);
		}

		// Need to update mTargetRootTask because if task was moved out of it, the original root
		// task may be destroyed.
		mTargetRootTask = intentActivity.getRootTask();