Merge "Skip packages with missing metadata." into klp-dev

2013-09-03 19:04:55 +00:00
parent 073ff1a663 5dea7d554a
commit 7f15b03d16
1 changed files with 5 additions and 0 deletions
--- a/services/java/com/android/server/pm/Settings.java
+++ b/services/java/com/android/server/pm/Settings.java
@@ -1385,6 +1385,11 @@ final class Settings {

                StringBuilder sb = new StringBuilder();
                for (final PackageSetting pkg : mPackages.values()) {
+                    if (pkg.pkg == null || pkg.pkg.applicationInfo == null) {
+                        Slog.w(TAG, "Skipping " + pkg + " due to missing metadata");
+                        continue;
+                    }
+
                    final ApplicationInfo ai = pkg.pkg.applicationInfo;
                    final String dataPath = ai.dataDir;
                    final boolean isDebug = (ai.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0;