ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 528fa1bb: Merge change Icabbe5fe into eclair-mr2

Browse Source 
Merge commit '528fa1bbca31c0c436dc6dc941286d9757f8675f' into eclair-mr2-plus-aosp

* commit '528fa1bbca31c0c436dc6dc941286d9757f8675f':
  Fix #2159410 (side-effect of unexpected account deletion)
This commit is contained in:
Marc Blank 2009-10-20 12:07:32 -07:00 committed by Android Git Automerger
commit 549fc327f1
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/exchange/SyncManager.java
View File

@ -727,7 +727,7 @@ public class SyncManager extends Service implements Runnable {
static public String getDeviceId() throws IOException {
return getDeviceId(null);
}
static public synchronized String getDeviceId(Context context) throws IOException {
if (sDeviceId != null) {
return sDeviceId;
@ -766,10 +766,10 @@ public class SyncManager extends Service implements Runnable {
}
/**
* Note that there are two ways the EAS SyncManager service can be created:
* Note that there are two ways the EAS SyncManager service can be created:
*
* 1) as a background service instantiated via startService (which happens on boot, when the
* first EAS account is created, etc), in which case the service thread is spun up, mailboxes
* 1) as a background service instantiated via startService (which happens on boot, when the
* first EAS account is created, etc), in which case the service thread is spun up, mailboxes
* sync, etc. and
* 2) to execute an RPC call from the UI, in which case the background service will already be
* running most of the time (unless we're creating a first EAS account)
@ -835,6 +835,7 @@ public class SyncManager extends Service implements Runnable {
mSyncedMessageObserver = null;
mMessageObserver = null;
mSyncStatusObserver = null;
mAccountsUpdatedListener = null;
}
}
@ -861,7 +862,7 @@ public class SyncManager extends Service implements Runnable {
INSTANCE.startService(new Intent(INSTANCE, SyncManager.class));
}
}
static public ConnPerRoute sConnPerRoute = new ConnPerRoute() {
public int getMaxForRoute(HttpRoute route) {
return 8;
@ -1448,7 +1449,7 @@ public class SyncManager extends Service implements Runnable {
if (mConnectivityReceiver != null) {
unregisterReceiver(mConnectivityReceiver);
}
if (INSTANCE != null) {
ContentResolver resolver = getContentResolver();
resolver.unregisterContentObserver(mAccountObserver);