diff options
author | Paul Westbrook <pwestbro@google.com> | 2012-11-21 15:38:30 -0800 |
---|---|---|
committer | Paul Westbrook <pwestbro@google.com> | 2012-11-21 16:01:36 -0800 |
commit | 2fd0058c0204b60966a77265e75bfbc471416aa8 (patch) | |
tree | f2b436b2d058da22de6c88f1a3f2c2fa839adf89 | |
parent | fcc33af67985b14916f6ff5f291248468dca1377 (diff) | |
download | Exchange-jb-mr1.1-release.tar.gz |
Only clear sync error map on successandroid-cts-4.2_r2android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1jb-mr1.1-release
We don't want to clear the error map unless there was a successful
sync. Otherwise, the device will attempt a sync evert 15 seconds
This is the first part of the fix for bug 7567773
Change-Id: Icd0e70d87a7f588e242f0f100ee0b36b3aa85d89
-rw-r--r-- | exchange2/src/com/android/exchange/EasAccountService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/exchange2/src/com/android/exchange/EasAccountService.java b/exchange2/src/com/android/exchange/EasAccountService.java index 58ddaf37..533a5df5 100644 --- a/exchange2/src/com/android/exchange/EasAccountService.java +++ b/exchange2/src/com/android/exchange/EasAccountService.java @@ -679,8 +679,6 @@ public class EasAccountService extends EasSyncService { } if (code == HttpStatus.SC_OK) { - // Make sure to clear out any pending sync errors - ExchangeService.removeFromSyncErrorMap(mMailboxId); if (!resp.isEmpty()) { InputStream is = resp.getInputStream(); int pingResult = parsePingResult(is, mContentResolver, @@ -708,6 +706,8 @@ public class EasAccountService extends EasSyncService { // Act as if we have an IOException (backoff, etc.) throw new IOException(); } + // Make sure to clear out any pending sync errors + ExchangeService.removeFromSyncErrorMap(mMailboxId); } else { userLog("Ping returned empty result; throwing IOException"); throw new IOException(); |