From 6b176245f5a81017f11088522aa144d048a9b0ab Mon Sep 17 00:00:00 2001 From: Jeff Davidson Date: Sat, 26 Apr 2014 08:49:59 -0700 Subject: [PATCH] Fix NPE in AppListPreference when there is no default. Bug: 14327074 Change-Id: I3b0dcfbefcfb91278582457beef5823072efc46a --- src/com/android/settings/AppListPreference.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/AppListPreference.java b/src/com/android/settings/AppListPreference.java index 919720ffac7..21809837403 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++;