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

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

Merge "Clear pending activity launches when force stop package"

parents a268c041 cfa825ff

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

+2 −0
Original line number Diff line number Diff line
@@ -6126,6 +6126,8 @@ public final class ActivityManagerService extends ActivityManagerNative 
                ProcessList.INVALID_ADJ, callerWillRestart, true, doit, evenPersistent,

                packageName == null ? ("stop user " + userId) : ("stop " + packageName));













        didSomething |= mActivityStarter.clearPendingActivityLaunchesLocked(packageName);



























        if (mStackSupervisor.finishDisabledPackageActivitiesLocked(















                packageName, null, doit, evenPersistent, userId)) {















            if (!doit) {

































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



+14
−0




























Original line number
Diff line number
Diff line








@@ -2091,4 +2091,18 @@ class ActivityStarter {













        return (flags & Intent.FLAG_ACTIVITY_NEW_DOCUMENT) != 0 &&















                (flags & Intent.FLAG_ACTIVITY_MULTIPLE_TASK) == 0;















    }



























    boolean clearPendingActivityLaunchesLocked(String packageName) {













        boolean didSomething = false;



























        for (int palNdx = mPendingActivityLaunches.size() - 1; palNdx >= 0; --palNdx) {













            PendingActivityLaunch pal = mPendingActivityLaunches.get(palNdx);













            ActivityRecord r = pal.r;













            if (r != null && r.packageName.equals(packageName)) {













                mPendingActivityLaunches.remove(palNdx);













                didSomething = true;













            }













        }













        return didSomething;













    }















}