From 4353053c87a8512f66f93c6d1b7583b584d21e71 Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Tue, 25 Jan 2022 13:20:03 -0800
Subject: [PATCH] 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
---
 .../Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java  | 4 ++++
 1 file changed, 4 insertions(+)

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 f0b2716f05d86..a201616db2087 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