LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Use TelephonyManager instead of ITelephony Binder"

Browse Source 
am: 138728da9a

Change-Id: I6172adeb2489abede44555b17340a6e58e23fafe
This commit is contained in:
Meng Wang
2019-11-20 20:44:19 -08:00
committed by android-build-merger
parent 3bac6b4b1c 138728da9a
commit 565782e413
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/java/android/net/ConnectivityManager.java
View File

@@ -52,12 +52,12 @@ import android.os.ServiceManager;
import android.os.ServiceSpecificException; import android.os.ServiceSpecificException;
import android.provider.Settings; import android.provider.Settings;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.Log; import android.util.Log;
import android.util.SparseIntArray; import android.util.SparseIntArray;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
import com.android.internal.telephony.ITelephony;
import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.PhoneConstants;
import com.android.internal.util.Preconditions; import com.android.internal.util.Preconditions;
import com.android.internal.util.Protocol; import com.android.internal.util.Protocol;
@@ -2149,19 +2149,14 @@ public class ConnectivityManager {
@Deprecated @Deprecated
@UnsupportedAppUsage @UnsupportedAppUsage
public boolean getMobileDataEnabled() { public boolean getMobileDataEnabled() {
IBinder b = ServiceManager.getService(Context.TELEPHONY_SERVICE); TelephonyManager tm = mContext.getSystemService(TelephonyManager.class);
if (b != null) { if (tm != null) {
try { int subId = SubscriptionManager.getDefaultDataSubscriptionId();
ITelephony it = ITelephony.Stub.asInterface(b); Log.d("ConnectivityManager", "getMobileDataEnabled()+ subId=" + subId);
int subId = SubscriptionManager.getDefaultDataSubscriptionId(); boolean retVal = tm.createForSubscriptionId(subId).isDataEnabled();
Log.d("ConnectivityManager", "getMobileDataEnabled()+ subId=" + subId); Log.d("ConnectivityManager", "getMobileDataEnabled()- subId=" + subId
boolean retVal = it.isUserDataEnabled(subId); + " retVal=" + retVal);
Log.d("ConnectivityManager", "getMobileDataEnabled()- subId=" + subId return retVal;
+ " retVal=" + retVal);
return retVal;
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
} }
Log.d("ConnectivityManager", "getMobileDataEnabled()- remote exception retVal=false"); Log.d("ConnectivityManager", "getMobileDataEnabled()- remote exception retVal=false");
return false; return false;