diff options
| author | 2022-02-02 01:31:37 +0000 | |
|---|---|---|
| committer | 2022-02-02 01:31:37 +0000 | |
| commit | 7abf467d0ad98dd67dcdcaab71a7be069e97785b (patch) | |
| tree | 17b9cd9c7fdad7fd52b4153d8da0e6d6e8491994 | |
| parent | e7d4aa1e1ca39cf886eb239a312c111d3a18c9c3 (diff) | |
| parent | 3cda688f631916aeb7295ae6bea73aa2463c3b0a (diff) | |
Merge changes from topic "presubmit-am-3741432fa32f48a290800d57fe4e6e74" into sc-v2-dev-plus-aosp
* changes:
[automerge] Add leash check in PipTaskOrganizer#fadeExistingPip 2p: 4353053c87
Add leash check in PipTaskOrganizer#fadeExistingPip
| -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 |