Merge "Replace hidden CM#isNetworkSupported() usage" into sc-dev am: 11222736

import android.graphics.drawable.Drawable;

import android.location.LocationManager;

import android.media.AudioManager;

import android.net.ConnectivityManager;

import android.net.NetworkCapabilities;

import android.net.TetheringManager;

import android.net.vcn.VcnTransportInfo;

import android.telephony.AccessNetworkConstants;

import android.telephony.NetworkRegistrationInfo;

import android.telephony.ServiceState;

import android.telephony.TelephonyManager;

import androidx.annotation.NonNull;

import androidx.core.graphics.drawable.RoundedBitmapDrawable;

    }

    public static boolean isWifiOnly(Context context) {

        return !context.getSystemService(ConnectivityManager.class)

                .isNetworkSupported(ConnectivityManager.TYPE_MOBILE);

        return !context.getSystemService(TelephonyManager.class).isDataCapable();

    }

    /** Returns if the automatic storage management feature is turned on or not. **/

package com.android.settingslib.net;

import static android.net.ConnectivityManager.TYPE_MOBILE;

import static android.net.NetworkStatsHistory.FIELD_RX_BYTES;

import static android.net.NetworkStatsHistory.FIELD_TX_BYTES;

import static android.net.TrafficStats.MB_IN_BYTES;

            PERIOD_BUILDER, Locale.getDefault());

    private final Context mContext;

    private final ConnectivityManager mConnectivityManager;

    private final INetworkStatsService mStatsService;

    private final NetworkPolicyManager mPolicyManager;

    private final NetworkStatsManager mNetworkStatsManager;

    public DataUsageController(Context context) {

        mContext = context;

        mConnectivityManager = ConnectivityManager.from(context);

        mStatsService = INetworkStatsService.Stub.asInterface(

                ServiceManager.getService(Context.NETWORK_STATS_SERVICE));

        mPolicyManager = NetworkPolicyManager.from(mContext);

    public boolean isMobileDataSupported() {

        // require both supported network and ready SIM

        return mConnectivityManager.isNetworkSupported(TYPE_MOBILE)

        return getTelephonyManager().isDataCapable()

                && getTelephonyManager().getSimState() == SIM_STATE_READY;

    }