diff --git a/src/com/android/settings/SettingsDumpService.java b/src/com/android/settings/SettingsDumpService.java index a57e9832d03..501536a6eb0 100644 --- a/src/com/android/settings/SettingsDumpService.java +++ b/src/com/android/settings/SettingsDumpService.java @@ -103,7 +103,7 @@ public class SettingsDumpService extends Service { DataUsageController controller = new DataUsageController(this); ConnectivityManager connectivityManager = getSystemService(ConnectivityManager.class); SubscriptionManager manager = SubscriptionManager.from(this); - TelephonyManager telephonyManager = TelephonyManager.from(this); + TelephonyManager telephonyManager = this.getSystemService(TelephonyManager.class); if (connectivityManager.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)) { JSONArray array = new JSONArray(); for (SubscriptionInfo info : manager.getAllSubscriptionInfoList()) { diff --git a/src/com/android/settings/datausage/DataUsageBaseFragment.java b/src/com/android/settings/datausage/DataUsageBaseFragment.java index f6e88cc1024..299ce433f37 100644 --- a/src/com/android/settings/datausage/DataUsageBaseFragment.java +++ b/src/com/android/settings/datausage/DataUsageBaseFragment.java @@ -51,7 +51,7 @@ public abstract class DataUsageBaseFragment extends DashboardFragment { services.mPolicyEditor = new NetworkPolicyEditor(services.mPolicyManager); - services.mTelephonyManager = TelephonyManager.from(context); + services.mTelephonyManager = context.getSystemService(TelephonyManager.class); services.mSubscriptionManager = SubscriptionManager.from(context); services.mUserManager = UserManager.get(context); } diff --git a/src/com/android/settings/datausage/DataUsageUtils.java b/src/com/android/settings/datausage/DataUsageUtils.java index 0e400a241f9..ef3e7b68d2a 100644 --- a/src/com/android/settings/datausage/DataUsageUtils.java +++ b/src/com/android/settings/datausage/DataUsageUtils.java @@ -33,7 +33,6 @@ import android.text.format.Formatter; import android.text.format.Formatter.BytesResult; import android.util.Log; -import java.util.ArrayList; import java.util.List; /** @@ -72,7 +71,7 @@ public final class DataUsageUtils extends com.android.settingslib.net.DataUsageU return false; } - final TelephonyManager telephonyManager = TelephonyManager.from(context); + final TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class); final NetworkStatsManager networkStatsManager = context.getSystemService(NetworkStatsManager.class); boolean hasEthernetUsage = false; @@ -115,7 +114,7 @@ public final class DataUsageUtils extends com.android.settingslib.net.DataUsageU } return false; } - final TelephonyManager tele = TelephonyManager.from(context); + final TelephonyManager tele = context.getSystemService(TelephonyManager.class); // require both supported network and ready SIM boolean isReady = true; for (SubscriptionInfo subInfo : subInfoList) { diff --git a/src/com/android/settings/network/telephony/DataServiceSetupPreferenceController.java b/src/com/android/settings/network/telephony/DataServiceSetupPreferenceController.java index d1fbd73e6b9..46f398c1896 100644 --- a/src/com/android/settings/network/telephony/DataServiceSetupPreferenceController.java +++ b/src/com/android/settings/network/telephony/DataServiceSetupPreferenceController.java @@ -63,7 +63,8 @@ public class DataServiceSetupPreferenceController extends TelephonyBasePreferenc public void init(int subId) { mSubId = subId; - mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId); + mTelephonyManager = mContext.getSystemService(TelephonyManager.class) + .createForSubscriptionId(mSubId); } @Override diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java index 3abb36a7c4e..675a1ba24db 100644 --- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java +++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java @@ -27,7 +27,6 @@ import android.os.PersistableBundle; import android.provider.Settings; import android.telephony.CarrierConfigManager; import android.telephony.RadioAccessFamily; -import android.telephony.ServiceState; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.text.TextUtils; @@ -148,7 +147,8 @@ public class EnabledNetworkModePreferenceController extends public void init(Lifecycle lifecycle, int subId) { mSubId = subId; final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId); - mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId); + mTelephonyManager = mContext.getSystemService(TelephonyManager.class) + .createForSubscriptionId(mSubId); final boolean isLteOnCdma = mTelephonyManager.getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE; diff --git a/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java b/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java index b8d2081f2ab..c1f294977eb 100644 --- a/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java +++ b/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java @@ -91,7 +91,8 @@ public class MmsMessagePreferenceController extends TelephonyTogglePreferenceCon public void init(int subId) { mSubId = subId; - mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId); + mTelephonyManager = mContext.getSystemService(TelephonyManager.class) + .createForSubscriptionId(mSubId); } @Override diff --git a/src/com/android/settings/network/telephony/MobileDataPreferenceController.java b/src/com/android/settings/network/telephony/MobileDataPreferenceController.java index c06b78b025d..f18340a75a0 100644 --- a/src/com/android/settings/network/telephony/MobileDataPreferenceController.java +++ b/src/com/android/settings/network/telephony/MobileDataPreferenceController.java @@ -138,7 +138,8 @@ public class MobileDataPreferenceController extends TelephonyTogglePreferenceCon public void init(FragmentManager fragmentManager, int subId) { mFragmentManager = fragmentManager; mSubId = subId; - mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId); + mTelephonyManager = mContext.getSystemService(TelephonyManager.class) + .createForSubscriptionId(mSubId); } @VisibleForTesting diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java index f1e0819bb8b..004291aa8bc 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java +++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java @@ -187,7 +187,8 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment { final Context context = getContext(); mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE); - mTelephonyManager = TelephonyManager.from(context).createForSubscriptionId(mSubId); + mTelephonyManager = context.getSystemService(TelephonyManager.class) + .createForSubscriptionId(mSubId); onRestoreInstance(icicle); } diff --git a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java index 7b24a936d1e..89e2d5b8fdb 100644 --- a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java +++ b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java @@ -20,7 +20,6 @@ import android.content.Context; import android.os.PersistableBundle; import android.provider.Settings; import android.telephony.CarrierConfigManager; -import android.telephony.ServiceState; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; @@ -97,7 +96,8 @@ public class PreferredNetworkModePreferenceController extends TelephonyBasePrefe public void init(int subId) { mSubId = subId; final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId); - mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId); + mTelephonyManager = mContext.getSystemService(TelephonyManager.class) + .createForSubscriptionId(mSubId); final boolean isLteOnCdma = mTelephonyManager.getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE; diff --git a/src/com/android/settings/network/telephony/cdma/CdmaBasePreferenceController.java b/src/com/android/settings/network/telephony/cdma/CdmaBasePreferenceController.java index ea7d82fe14f..07805b0c8e0 100644 --- a/src/com/android/settings/network/telephony/cdma/CdmaBasePreferenceController.java +++ b/src/com/android/settings/network/telephony/cdma/CdmaBasePreferenceController.java @@ -73,7 +73,8 @@ public abstract class CdmaBasePreferenceController extends TelephonyBasePreferen public void init(PreferenceManager preferenceManager, int subId) { mPreferenceManager = preferenceManager; mSubId = subId; - mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId); + mTelephonyManager = mContext.getSystemService(TelephonyManager.class) + .createForSubscriptionId(mSubId); } public void init(int subId) { diff --git a/src/com/android/settings/network/telephony/cdma/CdmaListPreference.java b/src/com/android/settings/network/telephony/cdma/CdmaListPreference.java index 14c71692946..2cb1840cdd8 100644 --- a/src/com/android/settings/network/telephony/cdma/CdmaListPreference.java +++ b/src/com/android/settings/network/telephony/cdma/CdmaListPreference.java @@ -41,6 +41,7 @@ public class CdmaListPreference extends ListPreference { } public void setSubId(int subId) { - mTelephonyManager = TelephonyManager.from(getContext()).createForSubscriptionId(subId); + mTelephonyManager = getContext().getSystemService(TelephonyManager.class) + .createForSubscriptionId(subId); } } diff --git a/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java b/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java index 56d0b2dcc69..626390a9bbb 100644 --- a/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java +++ b/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java @@ -144,7 +144,8 @@ public class AutoSelectPreferenceController extends TelephonyTogglePreferenceCon public AutoSelectPreferenceController init(int subId) { mSubId = subId; - mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId); + mTelephonyManager = mContext.getSystemService(TelephonyManager.class) + .createForSubscriptionId(mSubId); final PersistableBundle carrierConfig = mContext.getSystemService( CarrierConfigManager.class).getConfigForSubId(mSubId); mOnlyAutoSelectInHome = carrierConfig != null @@ -187,4 +188,4 @@ public class AutoSelectPreferenceController extends TelephonyTogglePreferenceCon public interface OnNetworkSelectModeListener { void onNetworkSelectModeChanged(); } -} \ No newline at end of file +} diff --git a/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java b/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java index d679373b567..8c3928d7d50 100644 --- a/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java +++ b/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java @@ -29,7 +29,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.core.BasePreferenceController; import com.android.settings.core.SubSettingLauncher; import com.android.settings.network.telephony.MobileNetworkUtils; import com.android.settings.network.telephony.NetworkSelectSettings; @@ -100,7 +99,8 @@ public class OpenNetworkSelectPagePreferenceController extends public OpenNetworkSelectPagePreferenceController init(int subId) { mSubId = subId; - mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId); + mTelephonyManager = mContext.getSystemService(TelephonyManager.class) + .createForSubscriptionId(mSubId); return this; }