From 0e4473329ce1796e6f9ea1c1c27ebffba5705f55 Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Fri, 23 Jul 2021 11:28:38 -0700
Subject: [PATCH] Check PiP permission before entering auto pip

Video: http://recall/-/aaaaaabFQoRHlzixHdtY/c9raN4jiaNqbiV7DF4YTJ6
Bug: 194272108
Test: try auto-enter-pip with permission disabled
Change-Id: I2c6112a299866744255b3cfe5c108fadfb2715af
---
 quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 88fcce1c30..37681a4fc3 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1168,6 +1168,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
             boolean isTranslucent = runningTaskTarget != null && runningTaskTarget.isTranslucent;
             boolean appCanEnterPip = !mDeviceState.isPipActive()
                     && runningTaskTarget != null
+                    && runningTaskTarget.allowEnterPip
                     && runningTaskTarget.taskInfo.pictureInPictureParams != null
                     && runningTaskTarget.taskInfo.pictureInPictureParams.isAutoEnterEnabled();
             HomeAnimationFactory homeAnimFactory =