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

Commit 5a5b2a49 authored by Andrii Kulian's avatar Andrii Kulian Committed by gitbuildkicker
Browse files

DO NOT MERGE -- Correctly finish activity in non-focused stack 

When activity is finished we first looked for next activity to
show in focused stack. If real next activity to show in place
of finishing one is in the same non-focused stack, we didn't
fully complete the dismissal process and activity was stuck in
FINISHING state.
This CL checks if we're trying to finish visible activity in
paused state and destroy it immediately if top running activity
is visible - same as we do for pinned activities.

Bug: 29458854
Change-Id: I0d5ceb2daa45c0628d89417c8456e132996bcea9
(cherry picked from commit 7318d63b)
(cherry picked from commit 620040db)
parent d7a94a8e

services/core/java/com/android/server/am/ActivityStack.java

+8 −1
Original line number Diff line number Diff line
@@ -3545,11 +3545,18 @@ final class ActivityStack { 


        if (mode == FINISH_IMMEDIATELY

                || (prevState == ActivityState.PAUSED

                    && (mode == FINISH_AFTER_PAUSE || mStackId == PINNED_STACK_ID))

                    && (mode == FINISH_AFTER_PAUSE || mode == FINISH_AFTER_VISIBLE

                        || mStackId == PINNED_STACK_ID))

                || prevState == ActivityState.STOPPED

                || prevState == ActivityState.INITIALIZING) {

            r.makeFinishingLocked();

            boolean activityRemoved = destroyActivityLocked(r, true, "finish-imm");



            if (prevState == ActivityState.PAUSED && mode == FINISH_AFTER_VISIBLE) {

                // Finishing activity that was in paused state - this can happen if it was in

                // not currently focused stack. Need to make something visible in its place.

                mStackSupervisor.ensureActivitiesVisibleLocked(null, 0, !PRESERVE_WINDOWS);

            }

            if (activityRemoved) {

                mStackSupervisor.resumeFocusedStackTopActivityLocked();

            }

services/core/java/com/android/server/am/ActivityStackSupervisor.java

+1 −1
Original line number Diff line number Diff line
@@ -1049,7 +1049,7 @@ public final class ActivityStackSupervisor implements DisplayListener { 
            return r;

        }



        // Return to the home stack.

        // Look in other non-focused and non-home stacks.

        final ArrayList<ActivityStack> stacks = mHomeStack.mStacks;

        for (int stackNdx = stacks.size() - 1; stackNdx >= 0; --stackNdx) {

            final ActivityStack stack = stacks.get(stackNdx);