diff options
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenUnfoldController.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenUnfoldController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenUnfoldController.java index fc1b704e95ad..aa3868cfca84 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenUnfoldController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenUnfoldController.java @@ -16,6 +16,7 @@ package com.android.wm.shell.fullscreen; +import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; import static android.util.MathUtils.lerp; import static android.view.Display.DEFAULT_DISPLAY; @@ -163,7 +164,10 @@ public final class FullscreenUnfoldController implements UnfoldListener, public void onTaskVanished(ActivityManager.RunningTaskInfo taskInfo) { AnimationContext animationContext = mAnimationContextByTaskId.get(taskInfo.taskId); if (animationContext != null) { - resetSurface(animationContext); + // PiP task has its own cleanup path, ignore surface reset to avoid conflict. + if (taskInfo.getWindowingMode() != WINDOWING_MODE_PINNED) { + resetSurface(animationContext); + } mAnimationContextByTaskId.remove(taskInfo.taskId); } |