am 25f84790: am 6fb86969: Fixed NPE in SelectSyncedCalendarsMultiAccount

* commit '25f84790f8df9217c33dbb098776c5e429501731':
  Fixed NPE in SelectSyncedCalendarsMultiAccount

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();