commit cc67281f5f2f952b9db6f7c4dad6d4fccec8f8ac
author Andrew Stadler <stadler@android.com> Fri Aug 21 17:05:18 2009 -0700
committer Andrew Stadler <stadler@android.com> Fri Aug 21 17:05:18 2009 -0700
tree 08e4d4ad292eebe949b9aed01bd66bf9596c62df
parent 0ae061397f85b03ed208c34703821f1216bcb46b

Two minor crash fixes

* Don't call deprecated presence Uri
* Don't return null from SyncManager.getAccountList()

src/com/android/exchange/SyncManager.java

diff --git a/src/com/android/exchange/SyncManager.java b/src/com/android/exchange/SyncManager.java
index 75126d3..ebb9722 100644
--- a/src/com/android/exchange/SyncManager.java
+++ b/src/com/android/exchange/SyncManager.java
@@ -161,6 +161,7 @@
         new HashMap<Long, PendingIntent>();
     // The actual WakeLock obtained by SyncManager
     private WakeLock mWakeLock = null;
+    private static final AccountList EMPTY_ACCOUNT_LIST = new AccountList();
 
     // Observers that we use to look for changed mail-related data
     private AccountObserver mAccountObserver;
@@ -314,7 +315,7 @@
         }
     };
 
-    class AccountList extends ArrayList<Account> {
+    static class AccountList extends ArrayList<Account> {
         private static final long serialVersionUID = 1L;
 
         public boolean contains(long id) {
@@ -545,7 +546,7 @@
         if (INSTANCE != null) {
             return INSTANCE.mAccountObserver.mAccounts;
         } else {
-            return null;
+            return EMPTY_ACCOUNT_LIST;
         }
     }