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

Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev

Browse Source
This commit is contained in:
Wink Saville
2014-12-09 17:52:26 +00:00
committed by Android (Google) Code Review
parent aa6ff6c7b0 689f70442c
commit 6490d8694a
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,6 +37,7 @@ import android.os.Messenger;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.provider.Settings; import android.provider.Settings;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.Log; import android.util.Log;
@@ -1295,9 +1296,15 @@ public class ConnectivityManager {
if (b != null) { if (b != null) {
try { try {
ITelephony it = ITelephony.Stub.asInterface(b); ITelephony it = ITelephony.Stub.asInterface(b);
return it.getDataEnabled(); int subId = SubscriptionManager.getDefaultDataSubId();
Log.d("ConnectivityManager", "getMobileDataEnabled()+ subId=" + subId);
boolean retVal = it.getDataEnabled(subId);
Log.d("ConnectivityManager", "getMobileDataEnabled()- subId=" + subId
+ " retVal=" + retVal);
return retVal;
} catch (RemoteException e) { } } catch (RemoteException e) { }
} }
Log.d("ConnectivityManager", "getMobileDataEnabled()- remote exception retVal=false");
return false; return false;
} }