From 544cb78646d1631f502762ac52594ea8d478b1d6 Mon Sep 17 00:00:00 2001 From: Makoto Onuki Date: Tue, 30 May 2017 11:01:06 -0700 Subject: Change WTF to e/w Fix 62191439 Test: adb shell am instrument -w com.android.providers.contacts.tests Change-Id: Ifbf97ce83e180e2f66483f1d15463c8015e17d8d --- src/com/android/providers/contacts/ContactsDatabaseHelper.java | 2 +- src/com/android/providers/contacts/ContactsProvider2.java | 5 ++--- 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); -- cgit v1.2.3