From 0d829e45fb5dcc48991c93dfc89d54c4443759d6 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Sun, 15 Mar 2015 15:11:52 -0700 Subject: [PATCH] Frameworks/base: Fix null-pointer access Fix a guaranteed null-pointer access in ProcessStats. Change-Id: I29d6156518fc225ca65afbb3a7aaae860d1ac560 --- core/java/com/android/internal/app/ProcessStats.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/java/com/android/internal/app/ProcessStats.java b/core/java/com/android/internal/app/ProcessStats.java index 70fb51072acf5..799901483e6b4 100644 --- a/core/java/com/android/internal/app/ProcessStats.java +++ b/core/java/com/android/internal/app/ProcessStats.java @@ -3399,10 +3399,11 @@ public final class ProcessStats implements Parcelable { + pkgList.keyAt(index) + "/" + proc.mUid + " for multi-proc " + proc.mName + " version " + proc.mVersion); } + String savedName = proc.mName; proc = pkg.mProcesses.get(proc.mName); if (proc == null) { throw new IllegalStateException("Didn't create per-package process " - + proc.mName + " in pkg " + pkg.mPackageName + "/" + pkg.mUid); + + savedName + " in pkg " + pkg.mPackageName + "/" + pkg.mUid); } holder.state = proc; }