diff options
author | wangqi <wangqi@google.com> | 2017-06-20 11:23:41 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-06-21 18:16:03 +0000 |
commit | 5b4becb8ca9cc6249d0cf0a074bf63d6999f3b5e (patch) | |
tree | 9ced1a3f07598cfb65cc3226368ba5321ee10107 /java/com/android/dialer/blocking | |
parent | f0a8ccfcd370d26b3887fc8428dedf5596f42ca8 (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/blocking')
-rw-r--r-- | java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java | 2 | ||||
-rw-r--r-- | java/com/android/dialer/blocking/FilteredNumberCompat.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java b/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java index fa74850ba..d806a8303 100644 --- a/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java +++ b/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java @@ -262,7 +262,7 @@ public class FilteredNumberAsyncQueryHandler extends AsyncQueryHandler { } /* - * TODO: b/27779827, non-e164 numbers can be blocked in the new form of blocking. As a + * TODO(maxwelb): b/27779827, non-e164 numbers can be blocked in the new form of blocking. As a * temporary workaround, determine which column of the database to query based on whether the * number is e164 or not. */ diff --git a/java/com/android/dialer/blocking/FilteredNumberCompat.java b/java/com/android/dialer/blocking/FilteredNumberCompat.java index 9e0112762..e104c4f94 100644 --- a/java/com/android/dialer/blocking/FilteredNumberCompat.java +++ b/java/com/android/dialer/blocking/FilteredNumberCompat.java @@ -270,7 +270,7 @@ public class FilteredNumberCompat { } // Great Wall blocking, must be primary user and the default or system dialer - // TODO: check that we're the system Dialer + // TODO(maxwelb): check that we're the system Dialer return TelecomUtil.isDefaultDialer(context) && safeBlockedNumbersContractCanCurrentUserBlockNumbers(context); } |