Merge commit '9e8fef57a5967a0056100921a294f464669c394d' into kraken * commit '9e8fef57a5967a0056100921a294f464669c394d': Fix NPE in SyncManager
This commit is contained in:
commit
801368ac4b
@ -830,9 +830,11 @@ public class SyncManager extends Service implements Runnable {
|
|||||||
|
|
||||||
static public String getEasAccountSelector() {
|
static public String getEasAccountSelector() {
|
||||||
SyncManager syncManager = INSTANCE;
|
SyncManager syncManager = INSTANCE;
|
||||||
if (syncManager == null) return null;
|
if (syncManager != null && syncManager.mAccountObserver != null) {
|
||||||
return syncManager.mAccountObserver.getAccountKeyWhere();
|
return syncManager.mAccountObserver.getAccountKeyWhere();
|
||||||
}
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
public class SyncStatus {
|
public class SyncStatus {
|
||||||
static public final int NOT_RUNNING = 0;
|
static public final int NOT_RUNNING = 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user