Merge "Fix NPE in PackageManagerService."

2014-05-21 20:14:56 +00:00
parent bc06158a78 0cfe875ac5
commit 838b1e2215
1 changed files with 11 additions and 9 deletions
--- a/services/java/com/android/server/pm/PackageManagerService.java
+++ b/services/java/com/android/server/pm/PackageManagerService.java
@ -5682,6 +5682,7 @@ public class PackageManagerService extends IPackageManager.Stub {
                    }

                    ps.cpuAbiString = adjustedAbi;
+                    if (ps.pkg != null && ps.pkg.applicationInfo != null) {
                        ps.pkg.applicationInfo.cpuAbi = adjustedAbi;
                        Slog.i(TAG, "Adjusting ABI for : " + ps.name + " to " + adjustedAbi);

@ -5695,6 +5696,7 @@ public class PackageManagerService extends IPackageManager.Stub {
                    }
                }
            }
+        }

        return true;
    }