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

Commit b3c07091 authored by Hongwei Wang's avatar Hongwei Wang Committed by Gerrit Code Review
Browse files

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

parents 0cf48623 9e498372

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

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