am 79ace451: am 09f0ab04: Merge "Fix NPE in SyncManager" into froyo

Merge commit '79ace45187236afc736c60bc0a0e70f284bce36b' into kraken

* commit '79ace45187236afc736c60bc0a0e70f284bce36b':
  Fix NPE in SyncManager
This commit is contained in:
Marc Blank 2010-04-30 11:29:35 -07:00 committed by Android Git Automerger
commit 475b37f49d

View File

@ -1180,9 +1180,11 @@ public class SyncManager extends Service implements Runnable {
} }
static private synchronized void shutdownConnectionManager() { static private synchronized void shutdownConnectionManager() {
if (sClientConnectionManager != null) {
sClientConnectionManager.shutdown(); sClientConnectionManager.shutdown();
sClientConnectionManager = null; sClientConnectionManager = null;
} }
}
public static void stopAccountSyncs(long acctId) { public static void stopAccountSyncs(long acctId) {
SyncManager syncManager = INSTANCE; SyncManager syncManager = INSTANCE;