drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Craig Mautner
2014-12-04 21:54:52 +00:00
committed by Android (Google) Code Review
parent 9052862ebb bc0975b3af
commit afca4dba31
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@ -2810,12 +2810,12 @@ public final class ActivityManagerService extends ActivityManagerNative
if (app == null) { if (app == null) {
checkTime(startTime, "startProcess: creating new process record"); checkTime(startTime, "startProcess: creating new process record");
app = newProcessRecordLocked(info, processName, isolated, isolatedUid); app = newProcessRecordLocked(info, processName, isolated, isolatedUid);
app.crashHandler = crashHandler;
if (app == null) { if (app == null) {
Slog.w(TAG, "Failed making new process record for " Slog.w(TAG, "Failed making new process record for "
+ processName + "/" + info.uid + " isolated=" + isolated); + processName + "/" + info.uid + " isolated=" + isolated);
return null; return null;
} }
app.crashHandler = crashHandler;
mProcessNames.put(processName, app.uid, app); mProcessNames.put(processName, app.uid, app);
if (isolated) { if (isolated) {
mIsolatedProcesses.put(app.uid, app); mIsolatedProcesses.put(app.uid, app);