commit 2f320c5475f285667d6be28023038b266e5e46a4
author Marc Blank <mblank@google.com> Wed May 05 20:48:09 2010 -0700
committer Marc Blank <mblank@google.com> Thu May 06 07:05:26 2010 -0700
tree 5afb63aaeffe3f3830c8aa8b241e93a85ad7e784
parent 87605f58bdcac3f7d8c97d6e8744099f00f957bb

Fix NPE in SyncManager

Bug: 2660742
Change-Id: I80ec62a0e128b3f20873a718d951e41f3fa2eb90

src/com/android/exchange/SyncManager.java

diff --git a/src/com/android/exchange/SyncManager.java b/src/com/android/exchange/SyncManager.java
index b451ef1..8059425 100644
--- a/src/com/android/exchange/SyncManager.java
+++ b/src/com/android/exchange/SyncManager.java
@@ -830,8 +830,10 @@
 
     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 {