aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhalid Zubair <kzubair@cyngn.com>2016-02-16 16:11:44 -0800
committerKhalid Zubair <kzubair@cyngn.com>2016-02-16 18:09:52 -0800
commitd483be17f4f924104dc1189a1c35030fafb47d5e (patch)
tree4e923cb98dede75516d4bf483276124b3e995712
parent754ddc04c88d935460bab362b06b823cfe12153e (diff)
downloadandroid_packages_apps_LockClock-d483be17f4f924104dc1189a1c35030fafb47d5e.tar.gz
android_packages_apps_LockClock-d483be17f4f924104dc1189a1c35030fafb47d5e.tar.bz2
android_packages_apps_LockClock-d483be17f4f924104dc1189a1c35030fafb47d5e.zip
LockClock: fix crash in calendar selection
onResume() was not updating the list of calendars when permission was already granted. This change fixes a NPE when clicking on the pref with null entries. CYNGNOS-1871 Change-Id: I3b690262087a0a22322c627214c27c3b64da5855
-rw-r--r--src/com/cyanogenmod/lockclock/preference/CalendarPreferences.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/cyanogenmod/lockclock/preference/CalendarPreferences.java b/src/com/cyanogenmod/lockclock/preference/CalendarPreferences.java
index 5f0f352..d2d3a03 100644
--- a/src/com/cyanogenmod/lockclock/preference/CalendarPreferences.java
+++ b/src/com/cyanogenmod/lockclock/preference/CalendarPreferences.java
@@ -77,6 +77,8 @@ public class CalendarPreferences extends PreferenceFragment implements
getPreferenceManager().getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
if (!hasCalendarPermission()) {
mShowCalendar.setChecked(false);
+ } else {
+ updateCalendars();
}
}