summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
author Mateusz Cicheński <mateuszc@google.com> 2022-09-02 01:23:52 +0000
committer Mateusz Cicheński <mateuszc@google.com> 2022-09-06 17:02:47 +0000
commit3e6c3a99147a1ea8fa04c85a6a0b8c09e1a13d6e (patch)
tree0a5fa5be46f8d73cbd5913ebb383b27ae31efc00 /libs
parent9fc9ab3d93ee2fa5b56829ebc096a3a5f94fc851 (diff)
Ignore scheduleFinishResizePip if there is no surface to operate on.
Unable to repro, but based on the stack trace it happens here. Adding proto logs to use when we collect repro steps from users. Bug: 242939615 Test: n/a, unable to repro Change-Id: I0d6761e26eb2bfadcd673bb3777812340aa060ae
Diffstat (limited to 'libs')
-rw-r--r--libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java6
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) {