am a6446151: am 93d419dd: am 40feb8f9: am 65d130ad: am b3be4655: Merge "Sync account immediately upon restore" into ub-gmail-ur14-dev

* commit 'a6446151cc450bce7e01e07d40a54bd0de67c791':
  Sync account immediately upon restore
This commit is contained in:
Tony Mantler 2014-11-02 19:02:06 +00:00 committed by Android Git Automerger
commit 5b93ef6df1

View File

@ -1631,14 +1631,18 @@ public class EmailProvider extends ContentProvider
// Try to restore them from saved JSON
int restoredCount = 0;
for (final android.accounts.Account amAccount : amAccounts) {
String jsonString = null;
jsonString = am.getUserData(amAccount, ACCOUNT_MANAGER_JSON_TAG);
final String jsonString = am.getUserData(amAccount, ACCOUNT_MANAGER_JSON_TAG);
if (TextUtils.isEmpty(jsonString)) {
continue;
}
final Account account = Account.fromJsonString(jsonString);
if (account != null) {
AccountSettingsUtils.commitSettings(context, account);
final Bundle extras = new Bundle(3);
extras.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
extras.putBoolean(ContentResolver.SYNC_EXTRAS_DO_NOT_RETRY, true);
extras.putBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, true);
ContentResolver.requestSync(amAccount, EmailContent.AUTHORITY, extras);
restoredCount++;
}
}