commit 2d3266e45e6ac15cab4d119a3775e54964ee4a3e
author Gary Mai <garymai@google.com> Wed Apr 12 17:23:04 2017 -0700
committer Gary Mai <garymai@google.com> Wed Apr 12 18:02:39 2017 -0700
tree b3c3b44393556a6fb2b60d01b45892110c31863c
parent 2ab85379c04c578f489a65993168d174ca233656

Reverse update accounts logic

Test: Manually verified the steps in bug don't reproduce the bug
and account type/authenticators are updated.

Bug: 37284929
Change-Id: I234dac08ac06c0b27b9afa9309759229ad90d96f

src/com/android/contacts/model/account/AccountTypeProvider.java

diff --git a/src/com/android/contacts/model/account/AccountTypeProvider.java b/src/com/android/contacts/model/account/AccountTypeProvider.java
index 38d8ca6..4f83ec6 100644
--- a/src/com/android/contacts/model/account/AccountTypeProvider.java
+++ b/src/com/android/contacts/model/account/AccountTypeProvider.java
@@ -140,14 +140,14 @@
     public boolean shouldUpdate(AuthenticatorDescription[] auths, SyncAdapterType[] syncTypes) {
         Map<String, AuthenticatorDescription> contactsAuths = onlyContactSyncable(auths, syncTypes);
         if (!contactsAuths.keySet().equals(mAuthTypes.keySet())) {
-            return false;
+            return true;
         }
         for (AuthenticatorDescription auth : contactsAuths.values()) {
             if (!deepEquals(mAuthTypes.get(auth.type), auth)) {
-                return false;
+                return true;
             }
         }
-        return true;
+        return false;
     }
 
     public boolean supportsContactsSyncing(String accountType) {
@@ -157,6 +157,9 @@
     private List<AccountType> loadTypes(String type) {
         final AuthenticatorDescription auth = mAuthTypes.get(type);
         if (auth == null) {
+            if (Log.isLoggable(TAG, Log.DEBUG)) {
+                Log.d(TAG, "Null auth type for " + type);
+            }
             return Collections.emptyList();
         }
 
@@ -170,6 +173,10 @@
             accountType = new SamsungAccountType(mContext, auth.packageName, type);
         } else if (!ExternalAccountType.hasContactsXml(mContext, auth.packageName)
                 && isLocalAccountType(mLocalAccountTypeFactory, type)) {
+            if (Log.isLoggable(TAG, Log.DEBUG)) {
+                Log.d(TAG, "Registering local account type=" + type
+                        + ", packageName=" + auth.packageName);
+            }
             accountType = mLocalAccountTypeFactory.getAccountType(type);
         } else {
             if (Log.isLoggable(TAG, Log.DEBUG)) {
@@ -184,6 +191,10 @@
                         + accountType.getClass().getCanonicalName());
             } else {
                 // Skip external account types that couldn't be initialized
+                if (Log.isLoggable(TAG, Log.DEBUG)) {
+                    Log.d(TAG, "Skipping external account type=" + type
+                            + ", packageName=" + auth.packageName);
+                }
                 return Collections.emptyList();
             }
         }