From 190343ac560de1ff550e436acb176f17fd228fdc Mon Sep 17 00:00:00 2001 From: zachh Date: Thu, 31 May 2018 17:30:46 -0700 Subject: Inlined ConfigProviderBindings.get() and removed ConfigProviderBindings. It no longer provides any value, so just use dagger directly. Bug: 80441695 Test: tap PiperOrigin-RevId: 198806461 Change-Id: Id607abb65b77633bce511ad0c943ac19453a85d5 --- java/com/android/dialer/assisteddialing/ConcreteCreator.java | 4 ++-- .../dialer/assisteddialing/ui/AssistedDialingSettingFragment.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'java/com/android/dialer/assisteddialing') diff --git a/java/com/android/dialer/assisteddialing/ConcreteCreator.java b/java/com/android/dialer/assisteddialing/ConcreteCreator.java index dfd28a661..050774340 100644 --- a/java/com/android/dialer/assisteddialing/ConcreteCreator.java +++ b/java/com/android/dialer/assisteddialing/ConcreteCreator.java @@ -27,7 +27,7 @@ import android.support.v4.os.UserManagerCompat; import android.telephony.TelephonyManager; import com.android.dialer.common.LogUtil; import com.android.dialer.configprovider.ConfigProvider; -import com.android.dialer.configprovider.ConfigProviderBindings; +import com.android.dialer.configprovider.ConfigProviderComponent; import com.android.dialer.strictmode.StrictModeUtils; /** @@ -55,7 +55,7 @@ public final class ConcreteCreator { public static AssistedDialingMediator createNewAssistedDialingMediator( @NonNull TelephonyManager telephonyManager, @NonNull Context context) { - ConfigProvider configProvider = ConfigProviderBindings.get(context); + ConfigProvider configProvider = ConfigProviderComponent.get(context).getConfigProvider(); if (telephonyManager == null) { LogUtil.i( diff --git a/java/com/android/dialer/assisteddialing/ui/AssistedDialingSettingFragment.java b/java/com/android/dialer/assisteddialing/ui/AssistedDialingSettingFragment.java index f1ea4c9dc..965a16975 100644 --- a/java/com/android/dialer/assisteddialing/ui/AssistedDialingSettingFragment.java +++ b/java/com/android/dialer/assisteddialing/ui/AssistedDialingSettingFragment.java @@ -29,7 +29,7 @@ import com.android.dialer.assisteddialing.AssistedDialingMediator; import com.android.dialer.assisteddialing.ConcreteCreator; import com.android.dialer.assisteddialing.CountryCodeProvider; import com.android.dialer.common.LogUtil; -import com.android.dialer.configprovider.ConfigProviderBindings; +import com.android.dialer.configprovider.ConfigProviderComponent; import com.android.dialer.logging.DialerImpression; import com.android.dialer.logging.Logger; import com.google.auto.value.AutoValue; @@ -70,7 +70,8 @@ public class AssistedDialingSettingFragment extends PreferenceFragment { getContext().getSystemService(TelephonyManager.class), getContext()); countryCodeProvider = - ConcreteCreator.getCountryCodeProvider(ConfigProviderBindings.get(getContext())); + ConcreteCreator.getCountryCodeProvider( + ConfigProviderComponent.get(getContext()).getConfigProvider()); // Load the preferences from an XML resource addPreferencesFromResource(R.xml.assisted_dialing_setting); -- cgit v1.2.3