From 1273c953455d497d93f504e17fa592834ed3a123 Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Thu, 30 Apr 2020 13:28:29 -0700
Subject: [PATCH] Put safeguard in dismissPip

Not able to reproduce the crash but in general, dismissPip should not
happen when not in PiP mode.

Bug: 155024023
Test: N/A
Change-Id: Iea19ffc632ca8ca411b25d8b08ee4e91b2dd7360
---
 .../src/com/android/systemui/pip/PipTaskOrganizer.java       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java b/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java
index d38c481752c69..7295f327d47a9 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java
@@ -238,6 +238,11 @@ public class PipTaskOrganizer extends TaskOrganizer {
      * @param animationDurationMs duration in millisecond for the exiting PiP transition
      */
     public void dismissPip(int animationDurationMs) {
+        if (!mInPip || mToken == null) {
+            Log.wtf(TAG, "Not allowed to dismissPip in current state"
+                    + " mInPip=" + mInPip + " mToken=" + mToken);
+            return;
+        }
         final WindowContainerTransaction wct = new WindowContainerTransaction();
         wct.setActivityWindowingMode(mToken, WINDOWING_MODE_UNDEFINED);
         WindowOrganizer.applyTransaction(wct);