am 017aeb6d: am c9f92395: am 468fe91d: Prevent account reconcile from running when service is down

This commit is contained in:
Marc Blank 2010-04-30 15:07:48 -07:00 committed by Android Git Automerger
commit 7d5986aa04

View File

@ -954,12 +954,14 @@ public class SyncManager extends Service implements Runnable {
android.accounts.Account[] accountMgrList = AccountManager.get(syncManager)
.getAccountsByType(Email.EXCHANGE_ACCOUNT_MANAGER_TYPE);
synchronized (sAccountList) {
// Make sure we have an up-to-date sAccountList
// Make sure we have an up-to-date sAccountList. If not (for example, if the
// service has been destroyed), we would be reconciling against an empty account
// list, which would cause the deletion of all of our accounts
if (mAccountObserver != null) {
mAccountObserver.onAccountChanged();
reconcileAccountsWithAccountManager(syncManager, sAccountList,
accountMgrList, false, mResolver);
}
reconcileAccountsWithAccountManager(syncManager, sAccountList,
accountMgrList, false, mResolver);
}
}
}.start();