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

Commit a73bed81 authored by Meng Wang's avatar Meng Wang
Browse files

Use TelephonyManager instead of ITelephony Binder 

Bug: 140908357
Test: make
Change-Id: If3be915329cc27c560af3fd71a903984a626aca8
parent 786d84b6

core/java/android/net/ConnectivityManager.java

+9 −14
Original line number Diff line number Diff line
@@ -52,12 +52,12 @@ import android.os.ServiceManager; 
import android.os.ServiceSpecificException;

import android.provider.Settings;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.util.ArrayMap;

import android.util.Log;

import android.util.SparseIntArray;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.telephony.ITelephony;

import com.android.internal.telephony.PhoneConstants;

import com.android.internal.util.Preconditions;

import com.android.internal.util.Protocol;
@@ -2149,19 +2149,14 @@ public class ConnectivityManager { 
    @Deprecated

    @UnsupportedAppUsage

    public boolean getMobileDataEnabled() {

        IBinder b = ServiceManager.getService(Context.TELEPHONY_SERVICE);

        if (b != null) {

            try {

                ITelephony it = ITelephony.Stub.asInterface(b);

        TelephonyManager tm = mContext.getSystemService(TelephonyManager.class);

        if (tm != null) {

            int subId = SubscriptionManager.getDefaultDataSubscriptionId();

            Log.d("ConnectivityManager", "getMobileDataEnabled()+ subId=" + subId);

                boolean retVal = it.isUserDataEnabled(subId);

            boolean retVal = tm.createForSubscriptionId(subId).isDataEnabled();

            Log.d("ConnectivityManager", "getMobileDataEnabled()- subId=" + subId

                    + " retVal=" + retVal);

            return retVal;

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

            }

        }

        Log.d("ConnectivityManager", "getMobileDataEnabled()- remote exception retVal=false");

        return false;