diff options
| author | 2022-09-06 23:24:03 +0000 | |
|---|---|---|
| committer | 2022-09-06 23:24:03 +0000 | |
| commit | 91a8c017b2977d0ae445d03c6db2441bfef8c113 (patch) | |
| tree | 37599751fc5aa11458e9cda62f28a00da8152dad /libs | |
| parent | 11288f20251d9c2941465c37d162e945728d8af4 (diff) | |
| parent | 3e6c3a99147a1ea8fa04c85a6a0b8c09e1a13d6e (diff) | |
Merge "Ignore scheduleFinishResizePip if there is no surface to operate on." into tm-qpr-dev
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java index b46eff6c55d4..297c79e86ad1 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java @@ -1306,6 +1306,12 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, return; } + if (mLeash == null || !mLeash.isValid()) { + Log.e(TAG, String.format("scheduleFinishResizePip with null leash! mState=%d", + mPipTransitionState.getTransitionState())); + return; + } + finishResize(createFinishResizeSurfaceTransaction(destinationBounds), destinationBounds, direction, -1); if (updateBoundsCallback != null) { |