commit 1cec7f8539e6465ff80577169d7d07df3c2574b7
author Narayan Kamath <narayan@google.com> Thu May 01 13:56:58 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 01 13:56:59 2014 +0000
tree 375fa50285fc6d2f83d458ff6ca1ec12b5bf65ec
parent 27f2bfc406157039c5241f6a4f38f597b2076e2a
parent f465db9f1d6da1c94af66b64e0450aba72ee8824

Merge "Don't adjust ABI if PackageSetting#pkg is null."

services/java/com/android/server/pm/PackageManagerService.java

diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java
index c214c83..b77c94c 100755
--- a/services/java/com/android/server/pm/PackageManagerService.java
+++ b/services/java/com/android/server/pm/PackageManagerService.java
@@ -5373,12 +5373,13 @@
             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());
+                        }
                     }
                 }
             }