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

Commit e5ba16a7 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Work on issue #5144065: Tap on Music icon from Home screen - a different app opens 

When force stopping an app, when removing its activities also finish any
activities from other apps above it in the task.  This avoids some situations
where the task gets into a bad state where its root becomes a different app.

Change-Id: I79e5cd520ae321bec80adefd2ccc2b0370ace372
parent 4ee36669

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

+14 −6
Original line number Diff line number Diff line
@@ -3327,20 +3327,28 @@ public final class ActivityManagerService extends ActivityManagerNative 
        boolean didSomething = killPackageProcessesLocked(name, uid, -100,

                callerWillRestart, false, doit, evenPersistent);

        

        for (i=mMainStack.mHistory.size()-1; i>=0; i--) {

        TaskRecord lastTask = null;

        for (i=0; i<mMainStack.mHistory.size(); i++) {

            ActivityRecord r = (ActivityRecord)mMainStack.mHistory.get(i);

            if (r.packageName.equals(name)

            final boolean samePackage = r.packageName.equals(name);

            if ((samePackage || r.task == lastTask)

                    && (r.app == null || evenPersistent || !r.app.persistent)) {

                if (!doit) {

                    return true;

                }

                didSomething = true;

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

                if (samePackage) {

                    if (r.app != null) {

                        r.app.removed = true;

                    }

                    r.app = null;

                r.stack.finishActivityLocked(r, i, Activity.RESULT_CANCELED, null, "uninstall");

                }

                lastTask = r.task;

                if (r.stack.finishActivityLocked(r, i, Activity.RESULT_CANCELED,

                        null, "force-stop")) {

                    i--;

                }

            }

        }