Merge "bug fix possible NPE while startProcessLocked()" into lmp-mr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
afca4dba31
@ -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);
|
||||
|
Reference in New Issue
Block a user