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

Commit 692dca60 authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Youtube application when moving to PIP animation was very bad" am: b3c07091 

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



Change-Id: I1ca28e9d80b0c065335bfb0867e2736da9330895
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7f5e2c32 b3c07091

services/core/java/com/android/server/wm/ActivityRecord.java

+1 −1
Original line number Diff line number Diff line
@@ -1701,7 +1701,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
                : null;

    }



    private void clearLastParentBeforePip() {

    void clearLastParentBeforePip() {

        if (mLastParentBeforePip != null) {

            mLastParentBeforePip.mChildPipActivity = null;

            mLastParentBeforePip = null;

services/core/java/com/android/server/wm/Task.java

+3 −0
Original line number Diff line number Diff line
@@ -2604,6 +2604,9 @@ class Task extends TaskFragment { 


        EventLogTags.writeWmTaskRemoved(mTaskId, reason);

        clearPinnedTaskIfNeed();

        if (mChildPipActivity != null) {

            mChildPipActivity.clearLastParentBeforePip();

        }

        // If applicable let the TaskOrganizer know the Task is vanishing.

        setTaskOrganizer(null);