From b3e4c798732356021be7c022112cada1517c4994 Mon Sep 17 00:00:00 2001
From: Marc Blank <mblank@google.com>
Date: Sun, 30 Aug 2009 17:29:32 -0700
Subject: [PATCH] Change ContentObserver for Account; fix two bugs

* Fixes 2085862 and 2087385

Change-Id: I38e046e861ec0423669506194c0bcd6c9c96328c
---
 src/com/android/exchange/SyncManager.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/android/exchange/SyncManager.java b/src/com/android/exchange/SyncManager.java
index 4b861ba04..3d6d527b7 100644
--- a/src/com/android/exchange/SyncManager.java
+++ b/src/com/android/exchange/SyncManager.java
@@ -383,8 +383,8 @@ public class SyncManager extends Service implements Runnable {
                         stopAccountSyncs(account.mId, true);
                         // Delete this from AccountManager...
                         android.accounts.Account acct =
-                            new android.accounts.Account(Eas.ACCOUNT_MANAGER_TYPE,
-                                    account.mEmailAddress);
+                            new android.accounts.Account(account.mEmailAddress,
+                                    Eas.ACCOUNT_MANAGER_TYPE);
                         AccountManager.get(SyncManager.this).removeAccount(acct, null, null);
                     } else {
                         // See whether any of our accounts has changed sync interval or window
@@ -665,7 +665,7 @@ public class SyncManager extends Service implements Runnable {
             }
             mResolver = getContentResolver();
             mAccountObserver = new AccountObserver(mHandler);
-            mResolver.registerContentObserver(Account.CONTENT_URI, false, mAccountObserver);
+            mResolver.registerContentObserver(Account.CONTENT_URI, true, mAccountObserver);
             mMailboxObserver = new MailboxObserver(mHandler);
             mSyncedMessageObserver = new SyncedMessageObserver(mHandler);
             mMessageObserver = new MessageObserver(mHandler);