aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMakoto Onuki <omakoto@google.com>2017-05-30 20:13:10 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-30 20:13:10 +0000
commit6139f5ca72674cdf88eea6f82f7cf61241f631e6 (patch)
tree095b9110eae25a9c0c412de2ae94fcb96de11f36
parent9805122df1cd098678b5349b509198ae1d95e211 (diff)
parent544cb78646d1631f502762ac52594ea8d478b1d6 (diff)
downloadContactsProvider-6139f5ca72674cdf88eea6f82f7cf61241f631e6.tar.gz
Change WTF to e/w
am: 544cb78646 Change-Id: I9ed7c746a50f4a13e79f8d291993c7db59baa797
-rw-r--r--src/com/android/providers/contacts/ContactsDatabaseHelper.java2
-rw-r--r--src/com/android/providers/contacts/ContactsProvider2.java5
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);