From 5b4becb8ca9cc6249d0cf0a074bf63d6999f3b5e Mon Sep 17 00:00:00 2001 From: wangqi Date: Tue, 20 Jun 2017 11:23:41 -0700 Subject: 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 --- .../calllog/datasources/contacts/ContactsDataSource.java | 10 +++++----- .../datasources/systemcalllog/SystemCallLogDataSource.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'java/com/android/dialer/calllog/datasources') diff --git a/java/com/android/dialer/calllog/datasources/contacts/ContactsDataSource.java b/java/com/android/dialer/calllog/datasources/contacts/ContactsDataSource.java index 82a85235b..db7421515 100644 --- a/java/com/android/dialer/calllog/datasources/contacts/ContactsDataSource.java +++ b/java/com/android/dialer/calllog/datasources/contacts/ContactsDataSource.java @@ -39,7 +39,7 @@ public final class ContactsDataSource implements CallLogDataSource { public boolean isDirty(Context appContext) { Assert.isWorkerThread(); - // TODO: Implementation. + // TODO(zachh): Implementation. return false; } @@ -49,7 +49,7 @@ public final class ContactsDataSource implements CallLogDataSource { Context appContext, CallLogMutations mutations) { Assert.isWorkerThread(); - // TODO: Implementation. + // TODO(zachh): Implementation. for (ContentValues contentValues : mutations.getInserts().values()) { contentValues.put(AnnotatedCallLog.CONTACT_NAME, "Placeholder name"); } @@ -57,12 +57,12 @@ public final class ContactsDataSource implements CallLogDataSource { @Override public void onSuccessfulFill(Context appContext) { - // TODO: Implementation. + // TODO(zachh): Implementation. } @Override public ContentValues coalesce(List individualRowsSortedByTimestampDesc) { - // TODO: Implementation. + // TODO(zachh): Implementation. return new RowCombiner(individualRowsSortedByTimestampDesc) .useSingleValueString(AnnotatedCallLog.CONTACT_NAME) .combine(); @@ -72,6 +72,6 @@ public final class ContactsDataSource implements CallLogDataSource { @Override public void registerContentObservers( Context appContext, ContentObserverCallbacks contentObserverCallbacks) { - // TODO: Guard against missing permissions during callback registration. + // TODO(zachh): Guard against missing permissions during callback registration. } } diff --git a/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java b/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java index f2063283f..86145a95b 100644 --- a/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java +++ b/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java @@ -143,7 +143,7 @@ public class SystemCallLogDataSource implements CallLogDataSource { @Override public ContentValues coalesce(List individualRowsSortedByTimestampDesc) { - // TODO: Complete implementation. + // TODO(zachh): Complete implementation. ContentValues coalescedValues = new RowCombiner(individualRowsSortedByTimestampDesc) .useMostRecentLong(AnnotatedCallLog.TIMESTAMP) @@ -182,7 +182,7 @@ public class SystemCallLogDataSource implements CallLogDataSource { DialerPhoneNumberUtil dialerPhoneNumberUtil = new DialerPhoneNumberUtil(PhoneNumberUtil.getInstance()); - // TODO: Really should be getting last 1000 by timestamp, not by last modified. + // TODO(zachh): Really should be getting last 1000 by timestamp, not by last modified. try (Cursor cursor = appContext .getContentResolver() -- cgit v1.2.3