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

Commit afca4dba authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "bug fix possible NPE while startProcessLocked()" into lmp-mr1-dev

parents 9052862e bc0975b3

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

+1 −1
Original line number Diff line number Diff line
@@ -2810,12 +2810,12 @@ public final class ActivityManagerService extends ActivityManagerNative 
        if (app == null) {

            checkTime(startTime, "startProcess: creating new process record");

            app = newProcessRecordLocked(info, processName, isolated, isolatedUid);

            app.crashHandler = crashHandler;

            if (app == null) {

                Slog.w(TAG, "Failed making new process record for "

                        + processName + "/" + info.uid + " isolated=" + isolated);

                return null;

            }

            app.crashHandler = crashHandler;

            mProcessNames.put(processName, app.uid, app);

            if (isolated) {

                mIsolatedProcesses.put(app.uid, app);