summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhalid Zubair <kzubair@cyngn.com>2016-02-16 16:11:44 -0800
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-02-18 09:27:24 -0800
commitc5bb591f84c2173143fbc668d2f1827185a66cd2 (patch)
tree775145ef231d2cb7ee07d88328b75226fa31c8b6
parent96f7b8cc03911b5117599457832f1a88a801ff45 (diff)
downloadpackages_apps_LockClock-c5bb591f84c2173143fbc668d2f1827185a66cd2.zip
packages_apps_LockClock-c5bb591f84c2173143fbc668d2f1827185a66cd2.tar.gz
packages_apps_LockClock-c5bb591f84c2173143fbc668d2f1827185a66cd2.tar.bz2
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();
}
}