summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountActivity.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountActivity.java b/src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountActivity.java
index 900ea7aa..0dd08ae0 100644
--- a/src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountActivity.java
+++ b/src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountActivity.java
@@ -103,13 +103,17 @@ public class SelectSyncedCalendarsMultiAccountActivity extends ExpandableListAct
@Override
protected void onPause() {
super.onPause();
- mAdapter.cancelRefreshStopDelay();
+ if (mAdapter != null) {
+ mAdapter.cancelRefreshStopDelay();
+ }
}
@Override
protected void onStop() {
super.onStop();
- mAdapter.closeChildrenCursors();
+ if (mAdapter != null) {
+ mAdapter.closeChildrenCursors();
+ }
if (mAccountsCursor != null && !mAccountsCursor.isClosed()) {
mAccountsCursor.close();
}