am f40149ff: Merge "Frameworks/base: Fix null-pointer access"

* commit 'f40149ff1f067193239c7b93f8fa617ceec101fe':
  Frameworks/base: Fix null-pointer access
This commit is contained in:
Andreas Gampe
2015-05-07 16:16:18 +00:00
committed by Android Git Automerger

View File

@@ -3365,10 +3365,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;
}