Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a370d9d1: am f54954f9: Merge "bug fix possible NPE while startProcessLocked()"

Browse Source 
* commit 'a370d9d19af04c2a9f9d5c5b5794a6a5cd6fd774':
  bug fix possible NPE while startProcessLocked()
This commit is contained in:
Craig Mautner
2014-12-02 18:11:25 +00:00
committed by Android Git Automerger
parent b361f48b38 a370d9d19a
commit 8abe01aa80
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

@@ -2773,12 +2773,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);