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

Commit a73b68fb authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Fix issue #22802617: APR: spurious wtf when restarting a persistent process 

Just don't do a wtf here, it isn't really wrong (though it isn't really
right, but at this point in a release it is right enough!).

Change-Id: Ic38a2e27556224cf8868f1fa18b4810929d67fcc
parent 3551a59b

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

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