From 2754c0150ceb627f0fd583c1b29bc752ffc24312 Mon Sep 17 00:00:00 2001 From: erfanian Date: Fri, 13 Oct 2017 17:08:48 -0700 Subject: Add config provider value for dynamic locales for assisted dialing. This is a dialer only feature and will not be available in the framework. Test: unit tests. PiperOrigin-RevId: 172166023 Change-Id: Ib2a0101386a9d892dab87c7c4fb8d4728d8c55f0 --- java/com/android/dialer/assisteddialing/ConcreteCreator.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 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 49d3b1f87..a8a9d2ab3 100644 --- a/java/com/android/dialer/assisteddialing/ConcreteCreator.java +++ b/java/com/android/dialer/assisteddialing/ConcreteCreator.java @@ -23,6 +23,7 @@ import android.os.Build.VERSION_CODES; import android.support.annotation.NonNull; import android.telephony.TelephonyManager; import com.android.dialer.common.LogUtil; +import com.android.dialer.configprovider.ConfigProvider; import com.android.dialer.configprovider.ConfigProviderBindings; /** @@ -50,6 +51,8 @@ public final class ConcreteCreator { public static AssistedDialingMediator createNewAssistedDialingMediator( @NonNull TelephonyManager telephonyManager, @NonNull Context context) { + ConfigProvider configProvider = ConfigProviderBindings.get(context); + if (telephonyManager == null) { LogUtil.i( "ConcreteCreator.createNewAssistedDialingMediator", "provided TelephonyManager was null"); @@ -61,11 +64,13 @@ public final class ConcreteCreator { } if ((Build.VERSION.SDK_INT < BUILD_CODE_FLOOR || Build.VERSION.SDK_INT > BUILD_CODE_CEILING) - || !ConfigProviderBindings.get(context).getBoolean("assisted_dialing_enabled", false)) { + || !configProvider.getBoolean("assisted_dialing_enabled", false)) { return new AssistedDialingMediatorStub(); } - Constraints constraints = new Constraints(context); + Constraints constraints = + new Constraints( + context, configProvider.getString("assisted_dialing_csv_country_codes", "")); return new AssistedDialingMediatorImpl( new LocationDetector(telephonyManager), new NumberTransformer(constraints)); } -- cgit v1.2.3