diff options
| author | Marc Blank <mblank@google.com> | 2012-08-22 22:25:42 -0700 |
|---|---|---|
| committer | Marc Blank <mblank@google.com> | 2012-08-31 23:26:36 -0700 |
| commit | e714bb9d153cfe13a7f0932e7d67ea08fa5a1d98 (patch) | |
| tree | 6c97a416701d99020cfe3a3067f5f0f332ff78c1 /emailsync/src | |
| parent | 5ac8d38796952a817f4693b38d62fc124651c121 (diff) | |
| download | android_packages_apps_Email-e714bb9d153cfe13a7f0932e7d67ea08fa5a1d98.tar.gz android_packages_apps_Email-e714bb9d153cfe13a7f0932e7d67ea08fa5a1d98.tar.bz2 android_packages_apps_Email-e714bb9d153cfe13a7f0932e7d67ea08fa5a1d98.zip | |
Convert authorities, intents, and account manager types
* Tested ok on wiped Nexus
* Tested ok on S3
* Upgrade verified on Nexus
Change-Id: If5d4ce594f8a309cdb59589d10b1d33f3b79326c
Diffstat (limited to 'emailsync/src')
| -rw-r--r-- | emailsync/src/com/android/emailsync/AbstractSyncService.java | 13 | ||||
| -rw-r--r-- | emailsync/src/com/android/emailsync/SyncManager.java | 1 |
2 files changed, 8 insertions, 6 deletions
diff --git a/emailsync/src/com/android/emailsync/AbstractSyncService.java b/emailsync/src/com/android/emailsync/AbstractSyncService.java index c9b151a4f..f64224feb 100644 --- a/emailsync/src/com/android/emailsync/AbstractSyncService.java +++ b/emailsync/src/com/android/emailsync/AbstractSyncService.java @@ -17,16 +17,16 @@ package com.android.emailsync; -import com.android.emailcommon.provider.Account; -import com.android.emailcommon.provider.HostAuth; -import com.android.emailcommon.provider.Mailbox; - import android.content.Context; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.os.Bundle; import android.util.Log; +import com.android.emailcommon.provider.Account; +import com.android.emailcommon.provider.HostAuth; +import com.android.emailcommon.provider.Mailbox; + import java.util.concurrent.LinkedBlockingQueue; /** @@ -48,7 +48,6 @@ public abstract class AbstractSyncService implements Runnable { public static final int CONNECT_TIMEOUT = 30*SECONDS; public static final int NETWORK_WAIT = 15*SECONDS; - public static final String EAS_PROTOCOL = "eas"; public static final int EXIT_DONE = 0; public static final int EXIT_IO_ERROR = 1; public static final int EXIT_LOGIN_FAILURE = 2; @@ -289,7 +288,9 @@ public abstract class AbstractSyncService implements Runnable { */ public void addRequest(Request req) { - mRequestQueue.offer(req); + if (!mRequestQueue.contains(req)) { + mRequestQueue.offer(req); + } } public void removeRequest(Request req) { diff --git a/emailsync/src/com/android/emailsync/SyncManager.java b/emailsync/src/com/android/emailsync/SyncManager.java index 4a518d939..886d13419 100644 --- a/emailsync/src/com/android/emailsync/SyncManager.java +++ b/emailsync/src/com/android/emailsync/SyncManager.java @@ -1357,6 +1357,7 @@ public abstract class SyncManager extends Service implements Runnable { @Override public void onCreate() { TAG = getClass().getSimpleName(); + EmailContent.init(this); Utility.runAsync(new Runnable() { @Override public void run() { |