Merge "Fix NPE in SyncManager" into froyo

This commit is contained in:
Marc Blank 2010-04-30 10:39:30 -07:00 committed by Android (Google) Code Review
commit 09f0ab0454

View File

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