summaryrefslogtreecommitdiff
path: root/libs/WindowManager
diff options
context:
space:
mode:
authorHongwei Wang <hwwang@google.com>2022-01-25 13:20:03 -0800
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-02-14 23:12:43 +0000
commit6d64b203f16a75e98b85eff21ff9b14537a97732 (patch)
treed522bf6ab382cfd3f2abadde93cc4a713bec8ec9 /libs/WindowManager
parent18b5537c74e29f3420882c37f81e95bebdb54029 (diff)
Add leash check in PipTaskOrganizer#fadeExistingPip
Bug: 197319184 Test: N/A, not sable to reproduce the issue, adding protection based on the stack trace Change-Id: I6363dd425eac6332f59fe1fed074c6518227580f (cherry picked from commit 4353053c87a8512f66f93c6d1b7583b584d21e71) Merged-In:I6363dd425eac6332f59fe1fed074c6518227580f
Diffstat (limited to 'libs/WindowManager')
-rw-r--r--libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java4
1 files changed, 4 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 f0b2716f05d8..a201616db208 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
@@ -825,6 +825,10 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
}
private void fadeExistingPip(boolean show) {
+ if (mLeash == null || !mLeash.isValid()) {
+ Log.w(TAG, "Invalid leash on fadeExistingPip: " + mLeash);
+ return;
+ }
final float alphaStart = show ? 0 : 1;
final float alphaEnd = show ? 1 : 0;
mPipAnimationController