commit bc9d6e2ce766d9453bf8193f42227889b83c3050
author android-build-team Robot <android-build-team-robot@google.com> Wed May 31 07:10:57 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed May 31 07:10:57 2017 +0000
tree c3edf01dd881468e425d5cbef34a8b94f1273e94
parent 06c040c5323b54ab598b3d502617f8178cb1a644
parent 544cb78646d1631f502762ac52594ea8d478b1d6

release-request-49d3fda6-f7aa-4b8d-aeeb-eed9adb96e3c-for-git_oc-release-4053943 snap-temp-L63500000069017893

Change-Id: I9750dd64b31e9f0b0790f0c223f5eea4b9bf1913

src/com/android/providers/contacts/ContactsDatabaseHelper.java

diff --git a/src/com/android/providers/contacts/ContactsDatabaseHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
index 07741de..89cc396 100644
--- a/src/com/android/providers/contacts/ContactsDatabaseHelper.java
+++ b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
@@ -5070,7 +5070,7 @@
     }
 
     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;
     }
 

src/com/android/providers/contacts/ContactsProvider2.java

diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index 0d2dd9e..69b87cf 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -4530,9 +4530,8 @@
                 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);