diff options
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 5 | 
1 files changed, 4 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index cf7ebe882f59..89e500e0432f 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -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          // need to clean up whatever may be there now.          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);          }          UidRecord uidRec = mActiveUids.get(proc.uid);  |