am 2b3bbb69: Fix NPE in SyncManager

Merge commit '2b3bbb6948ddb8bac1bf99ec1e8e880669735e71' into froyo-plus-aosp

* commit '2b3bbb6948ddb8bac1bf99ec1e8e880669735e71':
  Fix NPE in SyncManager
This commit is contained in:
Marc Blank 2010-05-06 12:12:32 -07:00 committed by Android Git Automerger
commit 9e8fef57a5

View File

@ -830,8 +830,10 @@ public class SyncManager extends Service implements Runnable {
static public String getEasAccountSelector() {
SyncManager syncManager = INSTANCE;
if (syncManager == null) return null;
return syncManager.mAccountObserver.getAccountKeyWhere();
if (syncManager != null && syncManager.mAccountObserver != null) {
return syncManager.mAccountObserver.getAccountKeyWhere();
}
return null;
}
public class SyncStatus {