Merge "Fix NPE in SyncManager" into froyo
This commit is contained in:
commit
09f0ab0454
@ -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;
|
||||||
|
Loading…
Reference in New Issue
Block a user