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

Merge "Fix issue #22802617: APR: spurious wtf when restarting a persistent process" into mnc-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2015-07-29 00:46:20 +00:00
committed by Android (Google) Code Review
parent b492ced89e a73b68fb85
commit 5b009d523c
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -5840,7 +5840,10 @@ public final class ActivityManagerService extends ActivityManagerNative
// We shouldn't already have a process under this name, but just in case we // We shouldn't already have a process under this name, but just in case we
// need to clean up whatever may be there now. // need to clean up whatever may be there now.
ProcessRecord old = removeProcessNameLocked(proc.processName, proc.uid); ProcessRecord old = removeProcessNameLocked(proc.processName, proc.uid);
if (old != null) { if (old == proc && proc.persistent) {
// We are re-adding a persistent process. Whatevs! Just leave it there.
Slog.w(TAG, "Re-adding persistent process " + proc);
} else if (old != null) {
Slog.wtf(TAG, "Already have existing proc " + old + " when adding " + proc); Slog.wtf(TAG, "Already have existing proc " + old + " when adding " + proc);
} }
UidRecord uidRec = mActiveUids.get(proc.uid); UidRecord uidRec = mActiveUids.get(proc.uid);