ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 2569cfcb: am 2ff1a5cd: am e87b38fa: Merge "Prevent account reconcilliation during migration" into ub-gmail-ur14-dev

Browse Source 
* commit '2569cfcb3159b2c4daba3cce5826ff769b297d63':
  Prevent account reconcilliation during migration
This commit is contained in:
Martin Hibdon 2014-11-02 17:37:02 +00:00 committed by Android Git Automerger
commit 1db58a95be
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/email/provider/AccountReconciler.java
View File

@ -37,6 +37,7 @@ import com.android.email.service.EmailServiceUtils.EmailServiceInfo;
import com.android.emailcommon.Logging; import com.android.emailcommon.Logging;
import com.android.emailcommon.provider.Account; import com.android.emailcommon.provider.Account;
import com.android.emailcommon.provider.HostAuth; import com.android.emailcommon.provider.HostAuth;
import com.android.emailcommon.utility.MigrationUtils;
import com.android.mail.utils.LogUtils; import com.android.mail.utils.LogUtils;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
@ -159,8 +160,13 @@ public class AccountReconciler {
boolean exchangeAccountDeleted = false; boolean exchangeAccountDeleted = false;
LogUtils.d(Logging.LOG_TAG, "reconcileAccountsInternal"); LogUtils.d(Logging.LOG_TAG, "reconcileAccountsInternal");
// See if we should have the Eas authenticators enabled.
if (MigrationUtils.migrationInProgress()) {
LogUtils.d(Logging.LOG_TAG, "deferring reconciliation, migration in progress");
return false;
}
// See if we should have the Eas authenticators enabled.
if (!EmailServiceUtils.isServiceAvailable(context, if (!EmailServiceUtils.isServiceAvailable(context,
context.getString(R.string.protocol_eas))) { context.getString(R.string.protocol_eas))) {
EmailServiceUtils.disableExchangeComponents(context); EmailServiceUtils.disableExchangeComponents(context);