commit b52a94118b8f612277d948dc926e928f12bc2026
author Marc Blank <mblank@google.com> Mon Oct 31 19:10:39 2011 -0700
committer Marc Blank <mblank@google.com> Mon Oct 31 19:18:29 2011 -0700
tree fa62dc1c2c110a2caac9134022fc6748a982edf4
parent 8b4543adb2e1eda9b0c0d3d7d89e03bff9e9fe44

Be extra careful before deleting accounts in observer

* It appears that silent errors in binder transaction might be
  causing us to delete Exchange accounts inappropriately
* Instead of directly deleting AccountManager accounts when we
  detect a missing EmailProvider account, we instead invoke
  the account reconciler, which runs entirely within the Email
  application
* After that, we check again, and if the account is really
  missing, we stop active syncs
* Add extra logging related to the detection of deleted
  accounts.
* Trigger AccountObserver on the notifier URI instead of
  the content URI to reduce observer spam

Bug: 5367821
Change-Id: Id0ed16713cf40aa14baaf7e0697a367754c492b0

src/com/android/exchange/ExchangeService.java

diff --git a/src/com/android/exchange/ExchangeService.java b/src/com/android/exchange/ExchangeService.java
index e333a83..e62fce0 100644
--- a/src/com/android/exchange/ExchangeService.java
+++ b/src/com/android/exchange/ExchangeService.java
@@ -17,7 +17,6 @@
 
 package com.android.exchange;
 
-import android.accounts.AccountManager;
 import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.app.Service;
@@ -724,15 +723,24 @@
                         // If the current list doesn't include this account and the account wasn't
                         // incomplete, then this is a deletion
                         if (!currentAccounts.contains(account.mId) && !accountIncomplete) {
-                            // Shut down any account-related syncs
-                            stopAccountSyncs(account.mId, true);
-                            // Delete this from AccountManager...
-                            android.accounts.Account acct = new android.accounts.Account(
-                                    account.mEmailAddress, Eas.EXCHANGE_ACCOUNT_MANAGER_TYPE);
-                            AccountManager.get(ExchangeService.this)
-                            .removeAccount(acct, null, null);
-                            mSyncableEasMailboxSelector = null;
-                            mEasAccountSelector = null;
+                            // The implication is that the account has been deleted; let's find out
+                            alwaysLog("Observer found deleted account: " + account.mDisplayName);
+                            // Run the reconciler (the reconciliation itself runs in the Email app)
+                            runAccountReconcilerSync(ExchangeService.this);
+                            // See if the account is still around
+                            Account deletedAccount =
+                                Account.restoreAccountWithId(context, account.mId);
+                            if (deletedAccount != null) {
+                                // It is; add it to our account list
+                                alwaysLog("Account still in provider: " + account.mDisplayName);
+                                currentAccounts.add(account);
+                            } else {
+                                // It isn't; stop syncs and clear our selectors
+                                alwaysLog("Account deletion confirmed: " + account.mDisplayName);
+                                stopAccountSyncs(account.mId, true);
+                                mSyncableEasMailboxSelector = null;
+                                mEasAccountSelector = null;
+                            }
                         } else {
                             // Get the newest version of this account
                             Account updatedAccount =
@@ -789,7 +797,7 @@
                 // See if there's anything to do...
                 kick("account changed");
             } catch (ProviderUnavailableException e) {
-                Log.w(TAG, "Observer failed; provider unavailable");
+                alwaysLog("Observer failed; provider unavailable");
             }
         }
 
@@ -1890,7 +1898,7 @@
                 // on the insert/delete/update of mailboxes and accounts
                 // We also observe synced messages to trigger upsyncs at the appropriate time
                 mAccountObserver = new AccountObserver(mHandler);
-                mResolver.registerContentObserver(Account.CONTENT_URI, true, mAccountObserver);
+                mResolver.registerContentObserver(Account.NOTIFIER_URI, true, mAccountObserver);
                 mMailboxObserver = new MailboxObserver(mHandler);
                 mResolver.registerContentObserver(Mailbox.CONTENT_URI, false, mMailboxObserver);
                 mSyncedMessageObserver = new SyncedMessageObserver(mHandler);