commit b999186b9ef6ce85cdfb8b0f58879458fb1dfe0e
author Hongwei Wang <hwwang@google.com> Sat Jul 31 03:14:11 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jul 31 03:14:11 2021 +0000
tree aaef110398f5588b7bb4f2c298b47a317139833f
parent bb6bb5bbbdcf85090454fda0342926417b4a01dd
parent 0e4473329ce1796e6f9ea1c1c27ebffba5705f55

Merge "Check PiP permission before entering auto pip" into sc-v2-dev

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 97f46a5..6249e6a 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1174,6 +1174,7 @@
             boolean isTranslucent = runningTaskTarget != null && runningTaskTarget.isTranslucent;
             boolean appCanEnterPip = !mDeviceState.isPipActive()
                     && runningTaskTarget != null
+                    && runningTaskTarget.allowEnterPip
                     && runningTaskTarget.taskInfo.pictureInPictureParams != null
                     && runningTaskTarget.taskInfo.pictureInPictureParams.isAutoEnterEnabled();
             HomeAnimationFactory homeAnimFactory =