summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/phonelookup/consolidator
diff options
context:
space:
mode:
authortwyen <twyen@google.com>2018-01-22 16:08:08 -0800
committerCopybara-Service <copybara-piper@google.com>2018-01-22 16:12:39 -0800
commit0e00f578d641440c5ddc4da48ab86eabbc21d403 (patch)
tree9ae99486deaf71b55a3f2a635ff95581d703c90b /java/com/android/dialer/phonelookup/consolidator
parenta2c2d5c65ec2aad3ba198ab645e01f51331c8e83 (diff)
Implement System blocked number
This CL implements looking up blocked number in the Android system blocked number provider, which is available after N. Dialer and system blocked number will return empty if requirements are not made (N+ and migration completed is needed for system, otherwise dialer should not be used). Bug: 70989543 Test: Unit tests PiperOrigin-RevId: 182852672 Change-Id: I1360b7eed7c18f459292d769529ffcfceb61a7ed
Diffstat (limited to 'java/com/android/dialer/phonelookup/consolidator')
-rw-r--r--java/com/android/dialer/phonelookup/consolidator/PhoneLookupInfoConsolidator.java21
1 files changed, 16 insertions, 5 deletions
diff --git a/java/com/android/dialer/phonelookup/consolidator/PhoneLookupInfoConsolidator.java b/java/com/android/dialer/phonelookup/consolidator/PhoneLookupInfoConsolidator.java
index ccad3e7bc..27f0d21ae 100644
--- a/java/com/android/dialer/phonelookup/consolidator/PhoneLookupInfoConsolidator.java
+++ b/java/com/android/dialer/phonelookup/consolidator/PhoneLookupInfoConsolidator.java
@@ -179,11 +179,7 @@ public final class PhoneLookupInfoConsolidator {
* returned.
*/
public String getNumberLabel() {
- if (phoneLookupInfo.hasDialerBlockedNumberInfo()
- && phoneLookupInfo
- .getDialerBlockedNumberInfo()
- .getBlockedState()
- .equals(BlockedState.BLOCKED)) {
+ if (isBlocked()) {
return appContext.getString(R.string.blocked_number_new_call_log_label);
}
@@ -219,6 +215,21 @@ public final class PhoneLookupInfoConsolidator {
return false;
}
+ public boolean isBlocked() {
+ // If system blocking reported blocked state it always takes priority over the dialer blocking.
+ // It will be absent if dialer blocking should be used.
+ if (phoneLookupInfo.getSystemBlockedNumberInfo().hasBlockedState()) {
+ return phoneLookupInfo
+ .getSystemBlockedNumberInfo()
+ .getBlockedState()
+ .equals(BlockedState.BLOCKED);
+ }
+ return phoneLookupInfo
+ .getDialerBlockedNumberInfo()
+ .getBlockedState()
+ .equals(BlockedState.BLOCKED);
+ }
+
/**
* Returns true if the {@link PhoneLookupInfo} passed to the constructor has incomplete CP2 local
* info.