commit d18b20f954fc8f1398ca8d924f3321b39ee05f3a
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Jul 31 23:12:49 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Jul 31 23:12:49 2021 +0000
tree aaef110398f5588b7bb4f2c298b47a317139833f
parent 9e02d1cd64ff4795bcbc2cab0be27f170bef4cf9
parent b999186b9ef6ce85cdfb8b0f58879458fb1dfe0e

Snap for 7600768 from b999186b9ef6ce85cdfb8b0f58879458fb1dfe0e to sc-v2-release

Change-Id: I2562aad44dadb0a00e9043ae9d72a6ccaa966482

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 =