Merge "[Settings] Replace TelephonyManager#from()" am: 19cebd9eca am: fb72a1094f am: 737783d5e4

Change-Id: I392268bd41ff76960107f137ae10ebf3dd151170
2019-12-23 03:04:51 +00:00
parent 74d79b5cda 737783d5e4
commit 778653fe71
13 changed files with 25 additions and 19 deletions
--- 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