From ca751a310c663559ceae22e4a0bbf41e34635589 Mon Sep 17 00:00:00 2001 From: erfanian Date: Wed, 29 Nov 2017 11:31:54 -0800 Subject: 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 --- .../android/dialer/assisteddialing/ConcreteCreator.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'java/com/android/dialer/assisteddialing/ConcreteCreator.java') 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); + } } -- cgit v1.2.3