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

Commit ad7923f1 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 5d4a5ccb: am 94d5e6b0: am 779ccbe3: am 5b009d52: Merge "Fix issue... 

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

* commit '5d4a5ccb':
  Fix issue #22802617: APR: spurious wtf when restarting a persistent process
parents 578d21fd 5d4a5ccb

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

+4 −1
Original line number Diff line number Diff line
@@ -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);