diff options
| author | Hongwei Wang <hwwang@google.com> | 2022-01-25 13:20:03 -0800 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-02-23 04:11:43 +0000 |
| commit | 1a820ee311df2104f560c7be00be47fec3258211 (patch) | |
| tree | ddac3e939291a405cced40c8a584dbb6aa80cdd0 | |
| parent | e7de5356086593c9c9633b6bdc40b734e2d8dcec (diff) | |
| download | base-1a820ee311df2104f560c7be00be47fec3258211.tar.gz | |
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
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java | 4 |
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 |