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

Commit 591a57d0 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Reset the last-activity-removal of the adjacent TaskFragment am: 5082dcb7 

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

Change-Id: Ia382167c249727e9a24a9a494df9a96c958a11d7
parents 7d8aa61d 5082dcb7

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -324,6 +324,7 @@ class TaskFragment extends WindowContainer<WindowContainer> { 
        // Reset the adjacent TaskFragment if its adjacent TaskFragment is also this TaskFragment.

        // Reset the adjacent TaskFragment if its adjacent TaskFragment is also this TaskFragment.

        if (mAdjacentTaskFragment != null && mAdjacentTaskFragment.mAdjacentTaskFragment == this) {

        if (mAdjacentTaskFragment != null && mAdjacentTaskFragment.mAdjacentTaskFragment == this) {

            mAdjacentTaskFragment.mAdjacentTaskFragment = null;

            mAdjacentTaskFragment.mAdjacentTaskFragment = null;

            mAdjacentTaskFragment.mDelayLastActivityRemoval = false;

        }

        }

        mAdjacentTaskFragment = null;

        mAdjacentTaskFragment = null;

        mDelayLastActivityRemoval = false;

        mDelayLastActivityRemoval = false;