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

Commit 3f11bba5 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

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

* commit 'afca4dba':
  bug fix possible NPE while startProcessLocked()
parents b97b19f6 afca4dba
Loading
Loading
Loading
Loading
+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);