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

Commit 7627b52c 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:... 

Merge "Youtube application when moving to PIP animation was very bad" am: b3c07091 am: 692dca60 am: a5476186 am: 2daf0364 am: 22fafab2

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



Change-Id: Ia60fdf4c09955a0d802a27a40240b4b625936fab
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7c618b17 22fafab2

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

+1 −1
Original line number Diff line number Diff line
@@ -1734,7 +1734,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
@@ -2584,6 +2584,9 @@ class Task extends TaskFragment { 


        EventLogTags.writeWmTaskRemoved(mTaskId, getRootTaskId(), getDisplayId(), reason);

        clearPinnedTaskIfNeed();

        if (mChildPipActivity != null) {

            mChildPipActivity.clearLastParentBeforePip();

        }

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

        setTaskOrganizer(null);