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

Commit 0015e454 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[RESTRICT AUTOMERGE]Don't finish noHistory activity while it is on the... 

Merge "[RESTRICT AUTOMERGE]Don't finish noHistory activity while it is on the topmost." into rvc-qpr-dev
parents 697b5fe2 59a51c6b

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

+3 −2
Original line number Diff line number Diff line
@@ -1700,8 +1700,9 @@ class ActivityStack extends Task { 
        // If the most recent activity was noHistory but was only stopped rather

        // than stopped+finished because the device went to sleep, we need to make

        // sure to finish it as we're making a new activity topmost.

        if (shouldSleepActivities() && mLastNoHistoryActivity != null &&

                !mLastNoHistoryActivity.finishing) {

        if (shouldSleepActivities() && mLastNoHistoryActivity != null

                && !mLastNoHistoryActivity.finishing

                && mLastNoHistoryActivity != next) {

            if (DEBUG_STATES) Slog.d(TAG_STATES,

                    "no-history finish of " + mLastNoHistoryActivity + " on new resume");

            mLastNoHistoryActivity.finishIfPossible("resume-no-history", false /* oomAdj */);

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

+3 −2
Original line number Diff line number Diff line
@@ -1481,9 +1481,10 @@ class ActivityStarter { 
            // anyone interested in this piece of information.

            final ActivityStack homeStack = targetTask.getDisplayArea().getRootHomeTask();

            final boolean homeTaskVisible = homeStack != null && homeStack.shouldBeVisible(null);

            final ActivityRecord top = targetTask.getTopNonFinishingActivity();

            final boolean visible = top != null && top.isVisible();

            mService.getTaskChangeNotificationController().notifyActivityRestartAttempt(

                    targetTask.getTaskInfo(), homeTaskVisible, clearedTask,

                    targetTask.getTopNonFinishingActivity().isVisible());

                    targetTask.getTaskInfo(), homeTaskVisible, clearedTask, visible);

        }

    }