commit 419fed1b064078a9e6a5892db73a40c6d6f382b4
author Brian Attwell <brianattwell@google.com> Thu Sep 04 14:58:09 2014 -0700
committer Brian Attwell <brianattwell@google.com> Thu Sep 04 14:58:09 2014 -0700
tree 4e064b1075ef0523e93c48829f1a6d821f9a2dbf
parent 1a686e30919379f621eaafebfda7a08ce9a167f2

Support gmail's exchange account type

Bug: 17383877
Change-Id: Ic175d456f6b9553a9d3e051c718d5eb37d406b53

src/com/android/contacts/common/model/account/ExchangeAccountType.java

diff --git a/src/com/android/contacts/common/model/account/ExchangeAccountType.java b/src/com/android/contacts/common/model/account/ExchangeAccountType.java
index 16e59cc..04b5263 100644
--- a/src/com/android/contacts/common/model/account/ExchangeAccountType.java
+++ b/src/com/android/contacts/common/model/account/ExchangeAccountType.java
@@ -41,8 +41,9 @@
 public class ExchangeAccountType extends BaseAccountType {
     private static final String TAG = "ExchangeAccountType";
 
-    public static final String ACCOUNT_TYPE_AOSP = "com.android.exchange";
-    public static final String ACCOUNT_TYPE_GOOGLE = "com.google.android.exchange";
+    private static final String ACCOUNT_TYPE_AOSP = "com.android.exchange";
+    private static final String ACCOUNT_TYPE_GOOGLE_1 = "com.google.android.exchange";
+    private static final String ACCOUNT_TYPE_GOOGLE_2 = "com.google.android.gm.exchange";
 
     public ExchangeAccountType(Context context, String authenticatorPackageName, String type) {
         this.accountType = type;
@@ -72,7 +73,8 @@
     }
 
     public static boolean isExchangeType(String type) {
-        return ACCOUNT_TYPE_AOSP.equals(type) || ACCOUNT_TYPE_GOOGLE.equals(type);
+        return ACCOUNT_TYPE_AOSP.equals(type) || ACCOUNT_TYPE_GOOGLE_1.equals(type)
+                || ACCOUNT_TYPE_GOOGLE_2.equals(type);
     }
 
     @Override