Merge "Fix EnterPipToOtherOrientation failure" into main (7979379f) · Commits · e / os / android_frameworks_base

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

+12 −19

Original line number	Diff line number	Diff line
		@@ -3782,10 +3782,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		}
		EventLogTags.writeWmEnterPip(r.mUserId, System.identityHashCode(r),
		r.shortComponentName, Boolean.toString(isAutoEnter));

		// Ensure the ClientTransactionItems are bundled for this operation.
		deferWindowLayout();
		try {
		r.setPictureInPictureParams(params);
		r.mAutoEnteringPip = isAutoEnter;
		mRootWindowContainer.moveActivityToPinnedRootTask(r,
		@@ -3798,9 +3794,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		"auto-pip");
		}
		r.mAutoEnteringPip = false;
		} finally {
		continueWindowLayout();
		}
		}
		};