am 5d4a5ccb: am 94d5e6b0: am 779ccbe3: am 5b009d52: Merge "Fix issue #22802617: APR: spurious wtf when restarting a persistent process" into mnc-dev

* commit '5d4a5ccbadb8d17a900297aa9e766824a0a0397c':
  Fix issue #22802617: APR: spurious wtf when restarting a persistent process

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 b19e843dbd73..8660fa092779 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -5824,7 +5824,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);