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

Commit a5476186 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 am: 692dca60 

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



Change-Id: Ia6f804dff29995648b5120f4f5ac4d51eb34e89f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8c60f910 692dca60

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

+1 −1
Original line number Diff line number Diff line
@@ -1717,7 +1717,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);