drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 838b1e22: Merge "Fix NPE in PackageManagerService."

Browse Source 
* commit '838b1e2215cbc27e77530f4c79124c088353e0e7':
  Fix NPE in PackageManagerService.
This commit is contained in:
narayan
2014-05-21 20:17:52 +00:00
committed by Android Git Automerger
parent 9ef2117f0e 838b1e2215
commit ab3d85ab1a
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/java/com/android/server/pm/PackageManagerService.java
View File

@ -5683,21 +5683,23 @@ public class PackageManagerService extends IPackageManager.Stub {
} }
for (PackageSetting ps : packagesForUser) { for (PackageSetting ps : packagesForUser) {
if (scannedPackage == null || ! scannedPackage.packageName.equals(ps.name)) { if (scannedPackage == null || !scannedPackage.packageName.equals(ps.name)) {
if (ps.cpuAbiString != null) { if (ps.cpuAbiString != null) {
continue; continue;
} }
ps.cpuAbiString = adjustedAbi; ps.cpuAbiString = adjustedAbi;
ps.pkg.applicationInfo.cpuAbi = adjustedAbi; if (ps.pkg != null && ps.pkg.applicationInfo != null) {
Slog.i(TAG, "Adjusting ABI for : " + ps.name + " to " + adjustedAbi); ps.pkg.applicationInfo.cpuAbi = adjustedAbi;
Slog.i(TAG, "Adjusting ABI for : " + ps.name + " to " + adjustedAbi);
if (performDexOptLI(ps.pkg, forceDexOpt, deferDexOpt, true) == DEX_OPT_FAILED) { if (performDexOptLI(ps.pkg, forceDexOpt, deferDexOpt, true) == DEX_OPT_FAILED) {
ps.cpuAbiString = null; ps.cpuAbiString = null;
ps.pkg.applicationInfo.cpuAbi = null; ps.pkg.applicationInfo.cpuAbi = null;
return false; return false;
} else { } else {
mInstaller.rmdex(ps.codePathString, getPreferredInstructionSet()); mInstaller.rmdex(ps.codePathString, getPreferredInstructionSet());
}
} }
} }
} }