Merge "Put safeguard in dismissPip" into rvc-dev am: 114b422d6d am: d225fe544b (35c7ef20) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -238,6 +238,11 @@ public class PipTaskOrganizer extends TaskOrganizer {
	* @param animationDurationMs duration in millisecond for the exiting PiP transition		* @param animationDurationMs duration in millisecond for the exiting PiP transition
	*/		*/
	public void dismissPip(int animationDurationMs) {		public void dismissPip(int animationDurationMs) {
			if (!mInPip \|\| mToken == null) {
			Log.wtf(TAG, "Not allowed to dismissPip in current state"
			+ " mInPip=" + mInPip + " mToken=" + mToken);
			return;
			}
	final WindowContainerTransaction wct = new WindowContainerTransaction();		final WindowContainerTransaction wct = new WindowContainerTransaction();
	wct.setActivityWindowingMode(mToken, WINDOWING_MODE_UNDEFINED);		wct.setActivityWindowingMode(mToken, WINDOWING_MODE_UNDEFINED);
	WindowOrganizer.applyTransaction(wct);		WindowOrganizer.applyTransaction(wct);