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

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

Browse Source
This commit is contained in:
Andreas Gampe
2015-05-07 15:47:29 +00:00
committed by Gerrit Code Review
parent 0cdf4e1175 0d829e45fb
commit f40149ff1f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/com/android/internal/app/ProcessStats.java
View File

@@ -3399,10 +3399,11 @@ public final class ProcessStats implements Parcelable {
+ pkgList.keyAt(index) + "/" + proc.mUid + pkgList.keyAt(index) + "/" + proc.mUid
+ " for multi-proc " + proc.mName + " version " + proc.mVersion); + " for multi-proc " + proc.mName + " version " + proc.mVersion);
} }
String savedName = proc.mName;
proc = pkg.mProcesses.get(proc.mName); proc = pkg.mProcesses.get(proc.mName);
if (proc == null) { if (proc == null) {
throw new IllegalStateException("Didn't create per-package process " 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; holder.state = proc;
} }