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

Commit 8695862b authored by Chilun Huang's avatar Chilun Huang Committed by Automerger Merge Worker
Browse files

Merge "Destroy the last embedded activity immediately" into tm-dev am: 5f99fcc0 am: 4be6f7cb 

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



Change-Id: I34ddb78ed03f938718eff9c0ef9019dcb2a090cc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ba9380a1 4be6f7cb

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

+3 −2
Original line number Diff line number Diff line
@@ -3532,7 +3532,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        final ActivityRecord next = getDisplayArea().topRunningActivity(

                true /* considerKeyguardState */);



        // If the finishing activity is the last activity of a organized TaskFragment and has an

        // If the finishing activity is the last activity of an organized TaskFragment and has an

        // adjacent TaskFragment, check if the activity removal should be delayed.

        boolean delayRemoval = false;

        final TaskFragment taskFragment = getTaskFragment();
@@ -3540,7 +3540,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
            final TaskFragment organized = taskFragment.getOrganizedTaskFragment();

            final TaskFragment adjacent =

                    organized != null ? organized.getAdjacentTaskFragment() : null;

            if (adjacent != null && organized.topRunningActivity() == null) {

            if (adjacent != null && next.isDescendantOf(adjacent)

                    && organized.topRunningActivity() == null) {

                delayRemoval = organized.isDelayLastActivityRemoval();

            }

        }