summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/assisteddialing/ConcreteCreator.java
diff options
context:
space:
mode:
authorerfanian <erfanian@google.com>2017-11-29 11:31:54 -0800
committerCopybara-Service <copybara-piper@google.com>2017-11-29 11:52:15 -0800
commitca751a310c663559ceae22e4a0bbf41e34635589 (patch)
tree45ed2b30e9c07c0c4a3c6d8174142c821bf5a68c /java/com/android/dialer/assisteddialing/ConcreteCreator.java
parent25f354ec753251ac4d420cad83cb47fa00f7c970 (diff)
Move country constraint logic into standalone class.
In a subsequent change, the assisted dialing settings will be able to use the parsing logic to filter the available countries listed in the settings. Bug: 69274259 Test: existing tests PiperOrigin-RevId: 177338864 Change-Id: I8ef76874d5f6d885b415174371225b738cc68716
Diffstat (limited to 'java/com/android/dialer/assisteddialing/ConcreteCreator.java')
-rw-r--r--java/com/android/dialer/assisteddialing/ConcreteCreator.java16
1 files changed, 13 insertions, 3 deletions
diff --git a/java/com/android/dialer/assisteddialing/ConcreteCreator.java b/java/com/android/dialer/assisteddialing/ConcreteCreator.java
index 806764567..1563b3513 100644
--- a/java/com/android/dialer/assisteddialing/ConcreteCreator.java
+++ b/java/com/android/dialer/assisteddialing/ConcreteCreator.java
@@ -86,9 +86,7 @@ public final class ConcreteCreator {
return new AssistedDialingMediatorStub();
}
- Constraints constraints =
- new Constraints(
- context, configProvider.getString("assisted_dialing_csv_country_codes", ""));
+ Constraints constraints = new Constraints(context, getCountryCodeProvider(configProvider));
return new AssistedDialingMediatorImpl(
new LocationDetector(
telephonyManager,
@@ -108,4 +106,16 @@ public final class ConcreteCreator {
&& Build.VERSION.SDK_INT <= BUILD_CODE_CEILING)
&& configProvider.getBoolean("assisted_dialing_enabled", false);
}
+
+ /**
+ * Returns a CountryCodeProvider responsible for providing countries eligible for assisted Dialing
+ */
+ public static CountryCodeProvider getCountryCodeProvider(ConfigProvider configProvider) {
+ if (configProvider == null) {
+ LogUtil.i("ConcreteCreator.getCountryCodeProvider", "provided configProvider was null");
+ throw new NullPointerException("Provided configProvider was null");
+ }
+
+ return new CountryCodeProvider(configProvider);
+ }
}