diff options
author | Sam Blitzstein <sblitz@google.com> | 2013-01-28 10:36:22 -0800 |
---|---|---|
committer | Sam Blitzstein <sblitz@google.com> | 2013-01-28 21:28:40 +0000 |
commit | 2ca9164900f740755429a5e7cc40aa3e24f0e4f7 (patch) | |
tree | 76cd9c64da2489ce44013c503ab8e87ff6068b20 | |
parent | be530f4f6fb2b3132b8bd8427824651bcded263f (diff) | |
download | android_packages_apps_Calendar-2ca9164900f740755429a5e7cc40aa3e24f0e4f7.tar.gz android_packages_apps_Calendar-2ca9164900f740755429a5e7cc40aa3e24f0e4f7.tar.bz2 android_packages_apps_Calendar-2ca9164900f740755429a5e7cc40aa3e24f0e4f7.zip |
Fix NPE when closing app.
Bug: 7967220
Change-Id: Idb05a80898e5d5ad4629bfc6a689c64ba8d551d9
-rw-r--r-- | src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountActivity.java | 8 |
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(); } |