Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix rare edge-cases pip crashes" into tm-qpr-dev am: a6e0a8eaf7

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20916320

Change-Id: I6d4fc18551530decf017e4c9c4f3e69d96d2f54d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Evan Rosky
2023-01-11 02:12:41 +00:00
committed by Automerger Merge Worker
parent 417d9b1e7d a6e0a8eaf7
commit 0b24dc057b
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

6
libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PhonePipMenuController.java
View File

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