From 0151a6af624ca85ad56c7f63acd6e3be8be49861 Mon Sep 17 00:00:00 2001 From: Tony Mantler Date: Wed, 16 Apr 2014 10:10:38 -0700 Subject: [PATCH] Null check mCheckFrequency before using b/14091609 Change-Id: I796774b7133ec68382d2580d0b1cde347aa143f8 --- .../activity/setup/AccountSettingsFragment.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/com/android/email/activity/setup/AccountSettingsFragment.java b/src/com/android/email/activity/setup/AccountSettingsFragment.java index 5805ea6a1..8d1b4bbcc 100644 --- a/src/com/android/email/activity/setup/AccountSettingsFragment.java +++ b/src/com/android/email/activity/setup/AccountSettingsFragment.java @@ -212,15 +212,21 @@ public class AccountSettingsFragment extends PreferenceFragment final CharSequence [] syncIntervals = savedInstanceState.getCharSequenceArray(SAVESTATE_SYNC_INTERVALS); mCheckFrequency = (ListPreference) findPreference(PREFERENCE_FREQUENCY); - mCheckFrequency.setEntries(syncIntervalStrings); - mCheckFrequency.setEntryValues(syncIntervals); + if (mCheckFrequency != null) { + mCheckFrequency.setEntries(syncIntervalStrings); + mCheckFrequency.setEntryValues(syncIntervals); + } } } public void onSaveInstanceState(Bundle outstate) { super.onSaveInstanceState(outstate); - outstate.putCharSequenceArray(SAVESTATE_SYNC_INTERVAL_STRINGS, mCheckFrequency.getEntries()); - outstate.putCharSequenceArray(SAVESTATE_SYNC_INTERVALS, mCheckFrequency.getEntryValues()); + if (mCheckFrequency != null) { + outstate.putCharSequenceArray(SAVESTATE_SYNC_INTERVAL_STRINGS, + mCheckFrequency.getEntries()); + outstate.putCharSequenceArray(SAVESTATE_SYNC_INTERVALS, + mCheckFrequency.getEntryValues()); + } } @Override