Merge "Update Pip launches to not enter pinned task if in background." into tm-qpr-dev (446102d4) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -1709,7 +1709,8 @@ class ActivityStarter {
		// If Activity's launching into PiP, move the mStartActivity immediately to pinned mode.
		// Note that mStartActivity and source should be in the same Task at this point.
		if (mOptions != null && mOptions.isLaunchIntoPip()
		&& sourceRecord != null && sourceRecord.getTask() == mStartActivity.getTask()) {
		&& sourceRecord != null && sourceRecord.getTask() == mStartActivity.getTask()
		&& balCode != BAL_BLOCK) {
		mRootWindowContainer.moveActivityToPinnedRootTask(mStartActivity,
		sourceRecord, "launch-into-pip");
		}