release-request-63504342-e033-4b9f-9c68-68bdd28fdc7c-for-git_oc-mr1-release-4054002 snap-temp-L53000000069019913

Change-Id: I623c2710200a7b1f134b0d4d33f712828ca33c89

2 files changed, 3 insertions, 4 deletions

diff --git a/src/com/android/providers/contacts/ContactsDatabaseHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
index 07741deb..89cc3964 100644
--- a/src/com/android/providers/contacts/ContactsDatabaseHelper.java
+++ b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
@@ -5070,7 +5070,7 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper {
     }
 
     private void reportInvalidSql(String callerPackage, InvalidSqlException e) {
-        logWtf(String.format("%s caller=%s", e.getMessage(), callerPackage));
+        Log.e(TAG, String.format("%s caller=%s", e.getMessage(), callerPackage));
         throw e;
     }
 
diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index 0d2dd9ed..69b87cf2 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -4530,9 +4530,8 @@ public class ContactsProvider2 extends AbstractContactsProvider
                 ret, Contacts.RAW_LAST_TIME_CONTACTED,
                 ret, Contacts.LR_LAST_TIME_CONTACTED);
         if (ret.containsKey(Contacts.LR_TIMES_CONTACTED)) {
-            getDatabaseHelper().logWtf(
-                    "Column '" + Contacts.LR_TIMES_CONTACTED + "' can no longer be modified"
-                    + " directly. Caller=" + getCallingPackage());
+            Log.w(TAG, "Column '" + Contacts.LR_TIMES_CONTACTED + "' can no longer be modified"
+                    + " directly, ignored.  Caller=" + getCallingPackage());
         }
 
         ret.remove(Contacts.LR_LAST_TIME_CONTACTED);