Merge "Fix NPE in AppListPreference when there is no default."

2014-04-26 18:44:35 +00:00
parent b0a7811742 6b176245f5
commit ab8d3e5a03
1 changed files with 2 additions and 1 deletions
--- a/src/com/android/settings/AppListPreference.java
+++ b/src/com/android/settings/AppListPreference.java
@@ -94,7 +94,8 @@ public class AppListPreference extends ListPreference {
            if (appInfo != null) {
                applicationNames[index] = appInfo.loadLabel(pm);
                mEntryDrawables[index] = appInfo.loadIcon(pm);
-                if (appInfo.packageName.contentEquals(defaultPackageName)) {
+                if (defaultPackageName != null &&
+                        appInfo.packageName.contentEquals(defaultPackageName)) {
                    selectedIndex = index;
                }
                index++;