Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f2b1ca2 authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Avoid conflict surface reset on auto-enter-pip" into sc-v2-dev am: fdf6eedb am: 096a5c5a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16150706

Change-Id: I5175c20fff4b9a47c7454139e984b7abc7ed3362
parents 1cf05649 096a5c5a

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

+5 −1
Original line number Diff line number Diff line
@@ -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) {

            // 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);

        }