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

am 60ee2059: Merge "Fix bug #2551196" into froyo

Browse Source 
Merge commit '60ee2059634a4191d999a837519eb406e02a57ec' into kraken

* commit '60ee2059634a4191d999a837519eb406e02a57ec':
  Fix bug #2551196
This commit is contained in:
Marc Blank 2010-04-07 17:03:49 -07:00 committed by Android Git Automerger
commit 1939abc170
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1598,7 +1598,7 @@ public class SyncManager extends Service implements Runnable {
thread.start();
mServiceMap.put(m.mId, service);
runAwake(m.mId);
if (!m.mServerId.startsWith(Eas.ACCOUNT_MAILBOX_PREFIX)) {
if ((m.mServerId != null) && !m.mServerId.startsWith(Eas.ACCOUNT_MAILBOX_PREFIX)) {
stopPing(m.mAccountKey);
}
}
@ -1782,9 +1782,12 @@ public class SyncManager extends Service implements Runnable {
}
}
}
stopServiceThreads();
log("Shutdown requested");
} catch (RuntimeException e) {
Log.e(TAG, "RuntimeException in SyncManager", e);
throw e;
} finally {
log("Finishing SyncManager");
// Lots of cleanup here
// Stop our running syncs
stopServiceThreads();