From bc0975b3afdb8ba80a6d54d898b299483ad680ad Mon Sep 17 00:00:00 2001 From: "younghwan1.kim" Date: Tue, 2 Dec 2014 13:04:40 +0900 Subject: [PATCH] bug fix possible NPE while startProcessLocked() In case, process doesn't create well while startingProcessLocked(). There is possibility to make NPE. Setting app's crash handler needs to be assigned after null check routine. Change-Id: I67fb6427f72d93f79fed36eb44c47d37eafdac31 --- .../core/java/com/android/server/am/ActivityManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 6823119d0c024..fde9049fb8647 100755 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -2808,12 +2808,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);