diff options
| author | Jeff Davidson <jpd@google.com> | 2014-04-26 08:49:59 -0700 |
|---|---|---|
| committer | Jeff Davidson <jpd@google.com> | 2014-04-26 08:49:59 -0700 |
| commit | 6b176245f5a81017f11088522aa144d048a9b0ab (patch) | |
| tree | 9b32c0db0ca9dfe0c5af950ee9341726c885bcb7 /src/com/android/settings/AppListPreference.java | |
| parent | 1102f76e5852d4cc482264e67c52cabf85d7a51d (diff) | |
| download | packages_apps_Settings-6b176245f5a81017f11088522aa144d048a9b0ab.zip packages_apps_Settings-6b176245f5a81017f11088522aa144d048a9b0ab.tar.gz packages_apps_Settings-6b176245f5a81017f11088522aa144d048a9b0ab.tar.bz2 | |
Fix NPE in AppListPreference when there is no default.
Bug: 14327074
Change-Id: I3b0dcfbefcfb91278582457beef5823072efc46a
Diffstat (limited to 'src/com/android/settings/AppListPreference.java')
| -rw-r--r-- | src/com/android/settings/AppListPreference.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/settings/AppListPreference.java b/src/com/android/settings/AppListPreference.java index 919720f..2180983 100644 --- 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++; |