aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMakoto Onuki <omakoto@google.com>2017-05-30 20:24:31 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-30 20:24:31 +0000
commitb3d8ed884fe44a0ffa46016f56331e2a57dee670 (patch)
treea97470d7a8b11ad05c78f9ef7ca4910c31dd2253
parent9ff27b66e1536a9ab643fe854c602be45ff3e55b (diff)
parent6139f5ca72674cdf88eea6f82f7cf61241f631e6 (diff)
downloadContactsProvider-b3d8ed884fe44a0ffa46016f56331e2a57dee670.tar.gz
Change WTF to e/w am: 544cb78646
am: 6139f5ca72 Change-Id: Ia8e62955413fc9efa1bfff3e68b4dda9bec67459
-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);