commit 6139f5ca72674cdf88eea6f82f7cf61241f631e6
author Makoto Onuki <omakoto@google.com> Tue May 30 20:13:10 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 30 20:13:10 2017 +0000
tree 095b9110eae25a9c0c412de2ae94fcb96de11f36
parent 9805122df1cd098678b5349b509198ae1d95e211
parent 544cb78646d1631f502762ac52594ea8d478b1d6

Change WTF to e/w
am: 544cb78646

Change-Id: I9ed7c746a50f4a13e79f8d291993c7db59baa797

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);