summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/calllog/database
diff options
context:
space:
mode:
authorwangqi <wangqi@google.com>2017-06-20 11:23:41 -0700
committerEric Erfanian <erfanian@google.com>2017-06-21 18:16:03 +0000
commit5b4becb8ca9cc6249d0cf0a074bf63d6999f3b5e (patch)
tree9ced1a3f07598cfb65cc3226368ba5321ee10107 /java/com/android/dialer/calllog/database
parentf0a8ccfcd370d26b3887fc8428dedf5596f42ca8 (diff)
Automated g4 rollback of changelist 158923709.
*** Reason for rollback *** It's not necessary anymore after we verified it could be controlled from server side. *** Original change description *** Flip flag to enable ReturnToCall bubble. Enables ReturnToCall bubble and changes the name of the flag so that it can be toggled independently from previous versions. *** Also in the change: Restore TODOs Test: TH PiperOrigin-RevId: 159587541 Change-Id: I88f01550f07a7859f41b4f0fc843e92b38f5a85b
Diffstat (limited to 'java/com/android/dialer/calllog/database')
-rw-r--r--java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java2
-rw-r--r--java/com/android/dialer/calllog/database/Coalescer.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java b/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java
index 887dfcbb6..5f48d7b1f 100644
--- a/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java
+++ b/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java
@@ -68,7 +68,7 @@ class AnnotatedCallLogDatabaseHelper extends SQLiteOpenHelper {
long startTime = System.currentTimeMillis();
db.execSQL(CREATE_TABLE_SQL);
db.execSQL(String.format(Locale.US, CREATE_TRIGGER_SQL, maxRows, maxRows));
- // TODO: Consider logging impression.
+ // TODO(zachh): Consider logging impression.
LogUtil.i(
"AnnotatedCallLogDatabaseHelper.onCreate",
"took: %dms",
diff --git a/java/com/android/dialer/calllog/database/Coalescer.java b/java/com/android/dialer/calllog/database/Coalescer.java
index 5683687fd..23ddc9c21 100644
--- a/java/com/android/dialer/calllog/database/Coalescer.java
+++ b/java/com/android/dialer/calllog/database/Coalescer.java
@@ -129,7 +129,7 @@ public class Coalescer {
*/
private static boolean rowsShouldBeCombined(
DialerPhoneNumberUtil dialerPhoneNumberUtil, ContentValues row1, ContentValues row2) {
- // TODO: Real implementation.
+ // TODO(zachh): Real implementation.
DialerPhoneNumber number1;
DialerPhoneNumber number2;
try {