Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19cebd9e authored by Bonian Chen's avatar Bonian Chen Committed by Gerrit Code Review
Browse files

Merge "[Settings] Replace TelephonyManager#from()"

parents 59baff6e 228dd34a

src/com/android/settings/SettingsDumpService.java

+1 −1
Original line number Diff line number Diff line
@@ -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()) {

src/com/android/settings/datausage/DataUsageBaseFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

    }

src/com/android/settings/datausage/DataUsageUtils.java

+2 −3
Original line number Diff line number Diff line
@@ -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) {

src/com/android/settings/network/telephony/DataServiceSetupPreferenceController.java

+2 −1
Original line number Diff line number Diff line
@@ -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

src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java

+2 −2
Original line number Diff line number Diff line
@@ -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;