commit 0b6ce453a21b9a98c5f59bc9074b4a60fc6c128b
author Amith Yamasani <yamasani@google.com> Thu Sep 04 23:04:21 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 04 23:04:21 2014 +0000
tree de9c6dfebd04bea7d169bac37c672070700217a6
parent 2d0368a775193230c8df41084868b485effcaa3c
parent 0e66e97d248fb3ae0ccb3730189f0159bbc23082

am 4a94107f: am 3971e42e: Merge "Fix crash if package setting is not populated yet" into lmp-dev

* commit '4a94107f50d77cc634bb7e931a25ce9ab6b263df':
  Fix crash if package setting is not populated yet

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

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 846efc0..116bc78 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -13035,6 +13035,9 @@
         Iterator<PackageSetting> psit = mSettings.mPackages.values().iterator();
         while (psit.hasNext()) {
             PackageSetting ps = psit.next();
+            if (ps.pkg == null) {
+                continue;
+            }
             final String packageName = ps.pkg.packageName;
             // Skip over if system app
             if ((ps.pkgFlags & ApplicationInfo.FLAG_SYSTEM) != 0) {