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

Commit ef2e7667 authored by Craig Mautner's avatar Craig Mautner Committed by Gerrit Code Review
Browse files

Merge "[ActivityManager] Avoid keeping restarting home when only home activity exists."

parents c66da9d6 3145b249

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

+9 −0
Original line number Diff line number Diff line
@@ -3370,6 +3370,7 @@ final class ActivityStack { 
    boolean forceStopPackageLocked(String name, boolean doit, boolean evenPersistent, int userId) {

        boolean didSomething = false;

        TaskRecord lastTask = null;

        ComponentName homeActivity = null;

        for (int taskNdx = mTaskHistory.size() - 1; taskNdx >= 0; --taskNdx) {

            final ArrayList<ActivityRecord> activities = mTaskHistory.get(taskNdx).mActivities;

            int numActivities = activities.size();
@@ -3388,6 +3389,14 @@ final class ActivityStack { 
                        }

                        return true;

                    }

                    if (r.isHomeActivity()) {

                        if (homeActivity != null && homeActivity.equals(r.realActivity)) {

                            Slog.i(TAG, "Skip force-stop again " + r);

                            continue;

                        } else {

                            homeActivity = r.realActivity;

                        }

                    }

                    didSomething = true;

                    Slog.i(TAG, "  Force finishing activity " + r);

                    if (samePackage) {