summaryrefslogtreecommitdiffstats
path: root/emailsync/src
diff options
context:
space:
mode:
authorPaul Westbrook <pwestbro@google.com>2012-08-06 10:50:00 -0700
committerPaul Westbrook <pwestbro@google.com>2012-08-06 10:50:00 -0700
commite444155bce035fe1315bcb8ab8782f528cec010b (patch)
tree8096a70a4b565aa21b6479419f0e70c4bbdba667 /emailsync/src
parente340b1f4df2aa2397262935f636edbff4e35a9c7 (diff)
downloadandroid_packages_apps_Email-e444155bce035fe1315bcb8ab8782f528cec010b.tar.gz
android_packages_apps_Email-e444155bce035fe1315bcb8ab8782f528cec010b.tar.bz2
android_packages_apps_Email-e444155bce035fe1315bcb8ab8782f528cec010b.zip
Fix ConcurrentModificationException
Bug: 6937046 Change-Id: I82e578d9b31b0064570deee9a9625ddf07826112
Diffstat (limited to 'emailsync/src')
-rw-r--r--emailsync/src/com/android/emailsync/SyncManager.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/emailsync/src/com/android/emailsync/SyncManager.java b/emailsync/src/com/android/emailsync/SyncManager.java
index e4e155e91..0500837fd 100644
--- a/emailsync/src/com/android/emailsync/SyncManager.java
+++ b/emailsync/src/com/android/emailsync/SyncManager.java
@@ -1931,7 +1931,9 @@ public abstract class SyncManager extends Service implements Runnable {
log("Dead thread, mailbox released: " +
c.getString(Mailbox.CONTENT_DISPLAY_NAME_COLUMN));
}
- releaseMailbox(mailboxId);
+ synchronized (sSyncLock) {
+ releaseMailbox(mailboxId);
+ }
// Restart this if necessary
if (nextWait > 3*SECONDS) {
nextWait = 3*SECONDS;