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

Commit 5b65b132 authored by liulvping's avatar liulvping Committed by android-build-merger
Browse files

Merge "Clear pending activity launches when force stop package" 

am: 00b678dd

Change-Id: Icd953ce6aff52a657e960d84799db7e4ca079688
parents 81701afb 00b678dd

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

+2 −0
Original line number Diff line number Diff line
@@ -6098,6 +6098,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








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













            }















        }















    }



























    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;













    }















}