am 8048f0fe: am 8917e52d: Fix regression that prevents calendar sync w/ new accounts

Merge commit '8048f0fef89c6d0cda8538cd5fe5103bf11cc2a9' into kraken

* commit '8048f0fef89c6d0cda8538cd5fe5103bf11cc2a9':
  Fix regression that prevents calendar sync w/ new accounts
This commit is contained in:
Marc Blank 2010-04-28 18:34:29 -07:00 committed by Android Git Automerger
commit 230dc85390

View File

@ -668,7 +668,9 @@ public class SyncManager extends Service implements Runnable {
if (observer != null) { if (observer != null) {
return (observer.mSyncEvents == 1); return (observer.mSyncEvents == 1);
} }
return false; // If there's no observer, there's no Calendar in CalendarProvider2, so we return true
// to allow Calendar creation
return true;
} }
private class CalendarObserver extends ContentObserver { private class CalendarObserver extends ContentObserver {