summaryrefslogtreecommitdiffstats
path: root/src/com/android/mail/preferences
diff options
context:
space:
mode:
authorMark Wei <markwei@google.com>2013-08-08 12:08:52 -0700
committerMark Wei <markwei@google.com>2013-08-08 12:12:16 -0700
commita88c13e14836d5db988f677671965ad51a2087e0 (patch)
tree024d8e9316e5c7a7eb5b5ae499c05dae2939d822 /src/com/android/mail/preferences
parente96ed341f6d5ae8534efef46b7d2c80f506fa944 (diff)
downloadandroid_packages_apps_UnifiedEmail-a88c13e14836d5db988f677671965ad51a2087e0.tar.gz
android_packages_apps_UnifiedEmail-a88c13e14836d5db988f677671965ad51a2087e0.tar.bz2
android_packages_apps_UnifiedEmail-a88c13e14836d5db988f677671965ad51a2087e0.zip
Prevent widget NPE crash.
Bug: 10155729 Change-Id: I215c472cf0f568538838ac549835ccd63209e29c
Diffstat (limited to 'src/com/android/mail/preferences')
-rw-r--r--src/com/android/mail/preferences/MailPrefs.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/mail/preferences/MailPrefs.java b/src/com/android/mail/preferences/MailPrefs.java
index bb796523b..ac06ceda6 100644
--- a/src/com/android/mail/preferences/MailPrefs.java
+++ b/src/com/android/mail/preferences/MailPrefs.java
@@ -22,6 +22,7 @@ import android.content.SharedPreferences;
import com.android.mail.providers.Account;
import com.android.mail.providers.UIProvider;
+import com.android.mail.utils.LogUtils;
import com.android.mail.widget.BaseWidgetProvider;
import com.google.common.collect.ImmutableSet;
@@ -159,6 +160,10 @@ public final class MailPrefs extends VersionedPrefs {
}
public void configureWidget(int appWidgetId, Account account, final String folderUri) {
+ if (account == null) {
+ LogUtils.e(LOG_TAG, "Cannot configure widget with null account");
+ return;
+ }
getEditor().putString(PreferenceKeys.WIDGET_ACCOUNT_PREFIX + appWidgetId,
createWidgetPreferenceValue(account, folderUri)).apply();
}