summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerfanian <erfanian@google.com>2017-11-28 09:05:45 -0800
committerCopybara-Service <copybara-piper@google.com>2017-11-29 11:44:54 -0800
commitfb06d3cd67e37500792b1b8ebb971e89821227cf (patch)
tree0253c1aeb4980d173f2e14d6a8e3024731b28778
parentb5bf47fa9e29fb659c55fbdd9b855f69bc3bfb4f (diff)
Expose user home country code as public method in Mediator Interface.
This will be used in a subsequent change to show the user the default/predetected country code in the assisted dialing settings. Bug: 68775522 Test: unit tests PiperOrigin-RevId: 177168946 Change-Id: Ic738a6ddde8766962a725668f6db5056ab0bcafd
-rw-r--r--java/com/android/dialer/assisteddialing/AssistedDialingMediator.java5
-rw-r--r--java/com/android/dialer/assisteddialing/AssistedDialingMediatorImpl.java8
-rw-r--r--java/com/android/dialer/assisteddialing/AssistedDialingMediatorStub.java8
3 files changed, 21 insertions, 0 deletions
diff --git a/java/com/android/dialer/assisteddialing/AssistedDialingMediator.java b/java/com/android/dialer/assisteddialing/AssistedDialingMediator.java
index 004d2f7da..756fd6125 100644
--- a/java/com/android/dialer/assisteddialing/AssistedDialingMediator.java
+++ b/java/com/android/dialer/assisteddialing/AssistedDialingMediator.java
@@ -27,6 +27,11 @@ public interface AssistedDialingMediator {
/** Returns {@code true} if the current client platform supports Assisted Dialing. */
public boolean isPlatformEligible();
+ /** Returns the country code in which the library thinks the user typically resides. */
+ @SuppressWarnings("AndroidApiChecker") // Use of optional
+ @TargetApi(VERSION_CODES.N)
+ public Optional<String> userHomeCountryCode();
+
@SuppressWarnings("AndroidApiChecker") // Use of optional
@TargetApi(VERSION_CODES.N)
public Optional<TransformationInfo> attemptAssistedDial(@NonNull String numberToTransform);
diff --git a/java/com/android/dialer/assisteddialing/AssistedDialingMediatorImpl.java b/java/com/android/dialer/assisteddialing/AssistedDialingMediatorImpl.java
index 1cc9732bb..7214437ab 100644
--- a/java/com/android/dialer/assisteddialing/AssistedDialingMediatorImpl.java
+++ b/java/com/android/dialer/assisteddialing/AssistedDialingMediatorImpl.java
@@ -56,6 +56,14 @@ final class AssistedDialingMediatorImpl implements AssistedDialingMediator {
return true;
}
+ /** Returns the country code in which the library thinks the user typically resides. */
+ @Override
+ @SuppressWarnings("AndroidApiChecker") // Use of optional
+ @TargetApi(VERSION_CODES.N)
+ public Optional<String> userHomeCountryCode() {
+ return locationDetector.getUpperCaseUserHomeCountry();
+ }
+
/**
* Returns an Optional of type String containing the transformed number that was provided. The
* transformed number should be capable of dialing out of the User's current country and
diff --git a/java/com/android/dialer/assisteddialing/AssistedDialingMediatorStub.java b/java/com/android/dialer/assisteddialing/AssistedDialingMediatorStub.java
index fe32e2c9a..9a40e0576 100644
--- a/java/com/android/dialer/assisteddialing/AssistedDialingMediatorStub.java
+++ b/java/com/android/dialer/assisteddialing/AssistedDialingMediatorStub.java
@@ -32,6 +32,14 @@ public final class AssistedDialingMediatorStub implements AssistedDialingMediato
return Optional.empty();
}
+ /** Always returns an empty Optional. */
+ @Override
+ @SuppressWarnings("AndroidApiChecker") // Use of optional
+ @TargetApi(VERSION_CODES.N)
+ public Optional<String> userHomeCountryCode() {
+ return Optional.empty();
+ }
+
@Override
public boolean isPlatformEligible() {
return false;