commit 45e87697ab7eec27795b954d0e2a64e367b71860
author Marc Blank <mblank@google.com> Mon Mar 01 11:06:21 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 01 11:06:21 2010 -0800
tree 08e02350a0bd6023991d97a72988222104decd9c
parent bda18e59abdb461414dde004dcb8a588a6f7ed73
parent aa288fe7ccbd28abcf990ce8337f2da677a1d370

Merge "Stop calendar/contacts sync in progress when sync setting is turned off"

src/com/android/exchange/SyncManager.java

diff --git a/src/com/android/exchange/SyncManager.java b/src/com/android/exchange/SyncManager.java
index ababcf3..5e0e594 100644
--- a/src/com/android/exchange/SyncManager.java
+++ b/src/com/android/exchange/SyncManager.java
@@ -1608,7 +1608,6 @@
         mResolver.registerContentObserver(Mailbox.CONTENT_URI, false, mMailboxObserver);
         mResolver.registerContentObserver(Message.SYNCED_CONTENT_URI, true, mSyncedMessageObserver);
         mResolver.registerContentObserver(Message.CONTENT_URI, true, mMessageObserver);
-        // TODO SYNC_OBSERVER_TYPE_SETTINGS is hidden.  Waiting for b/2337197
         ContentResolver.addStatusChangeListener(ContentResolver.SYNC_OBSERVER_TYPE_SETTINGS,
                 mSyncStatusObserver);
         mAccountsUpdatedListener = new EasAccountsUpdatedListener();