diff options
| author | Marc Blank <mblank@google.com> | 2012-08-01 12:39:16 -0700 |
|---|---|---|
| committer | Marc Blank <mblank@google.com> | 2012-08-01 13:51:19 -0700 |
| commit | 3a83ec1cf85a52741144b102b6b8f29cae4f7591 (patch) | |
| tree | b76d854b621bcddeb06fd44d3d3d0d99da8df3ee /emailsync | |
| parent | 42a63c5b52a0c6452f9ac28362e021905291c72a (diff) | |
| download | android_packages_apps_Email-3a83ec1cf85a52741144b102b6b8f29cae4f7591.tar.gz android_packages_apps_Email-3a83ec1cf85a52741144b102b6b8f29cae4f7591.tar.bz2 android_packages_apps_Email-3a83ec1cf85a52741144b102b6b8f29cae4f7591.zip | |
Don't save connection manager for autodiscover/validation
* Also add outlook.com to providers file
Change-Id: I2c334d1307b84899c3b64bd0c3f0cd92c190576e
Diffstat (limited to 'emailsync')
| -rw-r--r-- | emailsync/src/com/android/emailsync/SyncManager.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/emailsync/src/com/android/emailsync/SyncManager.java b/emailsync/src/com/android/emailsync/SyncManager.java index fe6db1fad..e4e155e91 100644 --- a/emailsync/src/com/android/emailsync/SyncManager.java +++ b/emailsync/src/com/android/emailsync/SyncManager.java @@ -879,8 +879,12 @@ public abstract class SyncManager extends Service implements Runnable { static public synchronized EmailClientConnectionManager getClientConnectionManager( Context context, HostAuth hostAuth) { - // We'll use a different connection manager for each ssl/port pair - EmailClientConnectionManager mgr = sClientConnectionManagers.get(hostAuth.mId); + // We'll use a different connection manager for each HostAuth + EmailClientConnectionManager mgr = null; + // We don't save managers for validation/autodiscover + if (hostAuth.mId != HostAuth.NOT_SAVED) { + mgr = sClientConnectionManagers.get(hostAuth.mId); + } if (mgr == null) { // After two tries, kill the process. Most likely, this will happen in the background // The service will restart itself after about 5 seconds |