Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid conflict surface reset on auto-enter-pip" into sc-v2-dev

Browse Source
This commit is contained in:
Hongwei Wang
2021-11-01 20:51:41 +00:00
committed by Android (Google) Code Review
parent cd12f1b260 5c80561b44
commit fdf6eedb10
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenUnfoldController.java
View File

@@ -16,6 +16,7 @@
package com.android.wm.shell.fullscreen; package com.android.wm.shell.fullscreen;
import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
import static android.util.MathUtils.lerp; import static android.util.MathUtils.lerp;
import static android.view.Display.DEFAULT_DISPLAY; import static android.view.Display.DEFAULT_DISPLAY;
@@ -163,7 +164,10 @@ public final class FullscreenUnfoldController implements UnfoldListener,
public void onTaskVanished(ActivityManager.RunningTaskInfo taskInfo) { public void onTaskVanished(ActivityManager.RunningTaskInfo taskInfo) {
AnimationContext animationContext = mAnimationContextByTaskId.get(taskInfo.taskId); AnimationContext animationContext = mAnimationContextByTaskId.get(taskInfo.taskId);
if (animationContext != null) { 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); mAnimationContextByTaskId.remove(taskInfo.taskId);
} }