commit 3e6143f560482e97edcf4557ef33c0e0461ae150
author Marc Blank <mblank@google.com> Wed Jul 25 13:28:59 2012 -0700
committer Marc Blank <mblank@google.com> Wed Jul 25 13:28:59 2012 -0700
tree d59537485aadfa514e2ac10d6f8064d59d3ce1c7
parent d70c67245c472c9738e0b68177db423bfc120f57

Rework getCapabilities() for new API

Change-Id: I82638cb80819a85def0ffb5eb3a9b3d2ded1957b

src/com/android/exchange/ExchangeService.java

diff --git a/src/com/android/exchange/ExchangeService.java b/src/com/android/exchange/ExchangeService.java
index b75a293..8fcdf01 100644
--- a/src/com/android/exchange/ExchangeService.java
+++ b/src/com/android/exchange/ExchangeService.java
@@ -96,6 +96,7 @@
 
     private static final int EAS_12_CAPABILITIES =
             AccountCapabilities.SYNCABLE_FOLDERS |
+            AccountCapabilities.SERVER_SEARCH |
             AccountCapabilities.FOLDER_SERVER_SEARCH |
             AccountCapabilities.SANITIZED_HTML |
             AccountCapabilities.SMART_REPLY |
@@ -318,12 +319,8 @@
         }
 
         @Override
-        public int getCapabilities(long accountId) throws RemoteException {
-            SyncManager exchangeService = INSTANCE;
-            if (exchangeService == null) return 0;
-            Account account = Account.restoreAccountWithId(exchangeService, accountId);
-            if (account == null) return 0;
-            String easVersion = account.mProtocolVersion;
+        public int getCapabilities(Account acct) throws RemoteException {
+            String easVersion = acct.mProtocolVersion;
             Double easVersionDouble = 2.5D;
             if (easVersion != null) {
                 try {