From 99ccd51b515bf6036aa339f12aab8aa5241b9fbe Mon Sep 17 00:00:00 2001
From: Chenjie Luo <cjluo@google.com>
Date: Tue, 14 Jul 2015 17:12:03 -0700
Subject: Remove extra logging with privacy info DO NOT MERGE

Bug: 22075764, 22379601
Change-Id: I05a27684641083fa3ce172d4ffa6b5ff0718af19
(cherry picked from commit 39867c22b1335d866d21a2c5c3b3e5123045d550)
---
 src/com/android/providers/contacts/ContactsProvider2.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index f36bed8..1373857 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -4771,7 +4771,6 @@ public class ContactsProvider2 extends AbstractContactsProvider
 
             if (!accountsWithDataSetsToDelete.isEmpty()) {
                 for (AccountWithDataSet accountWithDataSet : accountsWithDataSetsToDelete) {
-                    Log.d(TAG, "removing data for removed account " + accountWithDataSet);
                     final Long accountIdOrNull = dbHelper.getAccountIdOrNull(accountWithDataSet);
 
                     // getAccountIdOrNull() really shouldn't return null here, but just in case...
@@ -4959,7 +4958,7 @@ public class ContactsProvider2 extends AbstractContactsProvider
         try {
             return cs.getIsSyncable(account, ContactsContract.AUTHORITY) > 0;
         } catch (RemoteException e) {
-            Log.e(TAG, "Cannot obtain sync flag for account: " + account, e);
+            Log.e(TAG, "Cannot obtain sync flag for account", e);
             return false;
         }
     }
-- 
cgit v1.1


From 59af846139224607b667c61ee191bf363ef929ba Mon Sep 17 00:00:00 2001
From: Tingting Wang <tingtingw@google.com>
Date: Fri, 4 Dec 2015 15:35:42 -0800
Subject: Update directories when initializing ContactsProvider.

This is to fix a bug when reading exchange provider. Updating directories
can fix it without factory reset or account changed.

BUG 22398175

Change-Id: I36e05ff5f7bc83dc25ab165e5f5fb122bbe6c160
---
 src/com/android/providers/contacts/ContactsProvider2.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index 7dc7e7e..8904dc1 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -1687,6 +1687,7 @@ public class ContactsProvider2 extends AbstractContactsProvider
                 initForDefaultLocale();
                 mReadAccessLatch.countDown();
                 mReadAccessLatch = null;
+                updateDirectoriesInBackground(true);
                 break;
             }
 
-- 
cgit v1.1