Merge "Use TelephonyManager instead of ITelephony Binder" am: de953fd5f2 (33be3a80) · Commits · e / os / android_frameworks_base

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;