diff options
Diffstat (limited to 'services/java')
| -rwxr-xr-x | services/java/com/android/server/pm/PackageManagerService.java | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java index 5b3bbf9..309378a 100755 --- a/services/java/com/android/server/pm/PackageManagerService.java +++ b/services/java/com/android/server/pm/PackageManagerService.java @@ -5683,21 +5683,23 @@ public class PackageManagerService extends IPackageManager.Stub { } for (PackageSetting ps : packagesForUser) { - if (scannedPackage == null || ! scannedPackage.packageName.equals(ps.name)) { + if (scannedPackage == null || !scannedPackage.packageName.equals(ps.name)) { if (ps.cpuAbiString != null) { continue; } ps.cpuAbiString = 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) { - ps.cpuAbiString = null; - ps.pkg.applicationInfo.cpuAbi = null; - return false; - } else { - mInstaller.rmdex(ps.codePathString, getPreferredInstructionSet()); + if (ps.pkg != null && ps.pkg.applicationInfo != null) { + 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) { + ps.cpuAbiString = null; + ps.pkg.applicationInfo.cpuAbi = null; + return false; + } else { + mInstaller.rmdex(ps.codePathString, getPreferredInstructionSet()); + } } } } |