Merge "Fix rare edge-cases pip crashes" into tm-qpr-dev (a6e0a8ea) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -662,8 +662,8 @@ public class PipTransition extends PipTransitionController {
		}

		// Please file a bug to handle the unexpected transition type.
		throw new IllegalStateException("Entering PIP with unexpected transition type="
		+ transitTypeToString(transitType));
		android.util.Slog.e(TAG, "Found new PIP in transition with mis-matched type="
		+ transitTypeToString(transitType), new Throwable());
		}
		return false;
		}

+6 −0

Original line number	Diff line number	Diff line
		@@ -333,6 +333,9 @@ public class PhonePipMenuController implements PipMenuController {
		mTmpDestinationRectF.set(destinationBounds);
		mMoveTransform.setRectToRect(mTmpSourceRectF, mTmpDestinationRectF, Matrix.ScaleToFit.FILL);
		final SurfaceControl surfaceControl = getSurfaceControl();
		if (surfaceControl == null) {
		return;
		}
		final SurfaceControl.Transaction menuTx =
		mSurfaceControlTransactionFactory.getTransaction();
		menuTx.setMatrix(surfaceControl, mMoveTransform, mTmpTransform);
		@@ -359,6 +362,9 @@ public class PhonePipMenuController implements PipMenuController {
		}

		final SurfaceControl surfaceControl = getSurfaceControl();
		if (surfaceControl == null) {
		return;
		}
		final SurfaceControl.Transaction menuTx =
		mSurfaceControlTransactionFactory.getTransaction();
		menuTx.setCrop(surfaceControl, destinationBounds);