Merge "Check PiP permission before entering auto pip" into sc-v2-dev am: b999186b9e am: 28e8b2c84a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15376471 Change-Id: Ibf5b4bcc9bb2d651a268a874a64df951138776cd
2021-07-31 03:44:39 +00:00
parent be86a2638f 28e8b2c84a
commit abd74b94fa
1 changed files with 1 additions and 0 deletions
@@ -1174,6 +1174,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 =