diff options
| author | 2024-06-18 21:42:00 +0000 | |
|---|---|---|
| committer | 2024-06-18 21:42:00 +0000 | |
| commit | d587f782ebd099bcb91a3cc9b5f5ca05c69b73cf (patch) | |
| tree | f88bf968479bb4632f00712efc36a032dc73e3c9 | |
| parent | 8dd80d76c4f41018c35427ae638501c3f8f4c013 (diff) | |
| parent | 31ca359da43b513630aeec614a788631033a9764 (diff) | |
Merge "Do not allow exit PiP during swipe up" into main
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java index e4420d73886e..82add2904c26 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java @@ -608,6 +608,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, public void exitPip(int animationDurationMs, boolean requestEnterSplit) { if (!mPipTransitionState.isInPip() || mPipTransitionState.getTransitionState() == PipTransitionState.EXITING_PIP + || mPipTransitionState.getInSwipePipToHomeTransition() || mToken == null) { ProtoLog.wtf(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE, "%s: Not allowed to exitPip in current state" |