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

am 4d9749fd: am 2f5cb843: am 6490d869: Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev

Browse Source 
* commit '4d9749fd5d2852bb17c7c3b19df03a8c9e061593':
  Add subId as parameter for get/setDataEnabled.
This commit is contained in:
Wink Saville
2014-12-09 23:47:19 +00:00
committed by Android Git Automerger
parent 06abd9c5cb 4d9749fd5d
commit e135d0f2a2
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.ServiceManager;
import android.provider.Settings;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.util.ArrayMap;
import android.util.Log;
@@ -1297,9 +1298,15 @@ public class ConnectivityManager {
if (b != null) {
try {
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) { }
}
Log.d("ConnectivityManager", "getMobileDataEnabled()- remote exception retVal=false");
return false;
}