Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't actually try to stop processes marked 'persistent'"

Browse Source
This commit is contained in:
Christopher Tate
2011-07-27 12:41:42 -07:00
committed by Android (Google) Code Review
parent 88409f84bf 064d842ead
commit 3c6c3ddb6a
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -3369,6 +3369,10 @@ public final class ActivityManagerService extends ActivityManagerNative
final int NA = apps.size();
for (int ia=0; ia<NA; ia++) {
ProcessRecord app = apps.valueAt(ia);
if (app.persistent) {
// we don't kill persistent processes
continue;
}
if (app.removed) {
if (doit) {
procs.add(app);
@@ -3423,7 +3427,8 @@ public final class ActivityManagerService extends ActivityManagerNative
for (i=mMainStack.mHistory.size()-1; i>=0; i--) {
ActivityRecord r = (ActivityRecord)mMainStack.mHistory.get(i);
if (r.packageName.equals(name)) {
if (r.packageName.equals(name)
&& (r.app == null || !r.app.persistent)) {
if (!doit) {
return true;
}
@@ -3439,7 +3444,8 @@ public final class ActivityManagerService extends ActivityManagerNative
ArrayList<ServiceRecord> services = new ArrayList<ServiceRecord>();
for (ServiceRecord service : mServices.values()) {
if (service.packageName.equals(name)) {
if (service.packageName.equals(name)
&& (service.app == null || !service.app.persistent)) {
if (!doit) {
return true;
}