summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
Diffstat (limited to 'services')
-rwxr-xr-xservices/core/java/com/android/server/pm/PackageManagerService.java13
1 files changed, 7 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 707b3be..b0428cb 100755
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -5413,12 +5413,13 @@ public class PackageManagerService extends IPackageManager.Stub {
for (PackageSetting ps : packagesForUser) {
if (ps.requiredCpuAbiString == null) {
ps.requiredCpuAbiString = requirer.requiredCpuAbiString;
- ps.pkg.applicationInfo.requiredCpuAbi = requirer.requiredCpuAbiString;
-
- Slog.i(TAG, "Adjusting ABI for : " + ps.pkg.packageName + " to " + ps.requiredCpuAbiString);
- if (doDexOpt) {
- performDexOptLI(ps.pkg, forceDexOpt, deferDexOpt, true);
- mInstaller.rmdex(ps.codePathString, getPreferredInstructionSet());
+ if (ps.pkg != null) {
+ ps.pkg.applicationInfo.requiredCpuAbi = requirer.requiredCpuAbiString;
+ Slog.i(TAG, "Adjusting ABI for : " + ps.name + " to " + ps.requiredCpuAbiString);
+ if (doDexOpt) {
+ performDexOptLI(ps.pkg, forceDexOpt, deferDexOpt, true);
+ mInstaller.rmdex(ps.codePathString, getPreferredInstructionSet());
+ }
}
}
}