diff options
| author | Michael Chan <mchan@android.com> | 2012-09-28 10:46:29 -0700 |
|---|---|---|
| committer | Michael Chan <mchan@android.com> | 2012-09-28 11:00:49 -0700 |
| commit | 6fb869698103a0f897537fa7f4ebabe714db9d37 (patch) | |
| tree | c65a7f6f6cebc71b2b2e13061030df9f1af71475 /src | |
| parent | c3b4ddced501a072af3034ea624c67ec763e57c0 (diff) | |
| download | android_packages_apps_Calendar-6fb869698103a0f897537fa7f4ebabe714db9d37.tar.gz android_packages_apps_Calendar-6fb869698103a0f897537fa7f4ebabe714db9d37.tar.bz2 android_packages_apps_Calendar-6fb869698103a0f897537fa7f4ebabe714db9d37.zip | |
Fixed NPE in SelectSyncedCalendarsMultiAccount
Bug: 7252078
Change-Id: If2334dde784e7763f9221b59797224d5783687da
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountActivity.java | 4 | ||||
| -rw-r--r-- | src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountAdapter.java | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountActivity.java b/src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountActivity.java index c89387c9..a4e628c1 100644 --- a/src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountActivity.java +++ b/src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountActivity.java @@ -60,7 +60,9 @@ public class SelectSyncedCalendarsMultiAccountActivity extends ExpandableListAct null /* selectionArgs */, Calendars.ACCOUNT_NAME /*sort order*/); MatrixCursor accountsCursor = Utils.matrixCursorFromCursor(mCursor); - startManagingCursor(accountsCursor); + if (accountsCursor != null) { + startManagingCursor(accountsCursor); + } mAdapter = new SelectSyncedCalendarsMultiAccountAdapter(findViewById(R.id.calendars) .getContext(), accountsCursor, this); diff --git a/src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountAdapter.java b/src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountAdapter.java index 58b99ebf..77a8da72 100644 --- a/src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountAdapter.java +++ b/src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountAdapter.java @@ -88,7 +88,6 @@ public class SelectSyncedCalendarsMultiAccountAdapter extends CursorTreeAdapter // How long to keep refreshing for private static final int REFRESH_DURATION = 60000; private static boolean mRefresh = true; - private int mNumAccounts; private static String mSyncedText; private static String mNotSyncedText; @@ -204,11 +203,8 @@ public class SelectSyncedCalendarsMultiAccountAdapter extends CursorTreeAdapter mCalendarsUpdater = new AsyncCalendarsUpdater(mResolver); } - mNumAccounts = acctsCursor.getCount(); - if (mNumAccounts == 0) { - // Should never happen since Calendar requires an account exist to - // use it. - Log.e(TAG, "SelectCalendarsAdapter: No accounts were returned!"); + if (acctsCursor == null || acctsCursor.getCount() == 0) { + Log.i(TAG, "SelectCalendarsAdapter: No accounts were returned!"); } // Collect proper description for account types mAuthDescs = AccountManager.get(context).getAuthenticatorTypes(); |