commit 6490d8694a3a952940bfc1f41a1a738bbbff5127
author Wink Saville <wink@google.com> Tue Dec 09 17:52:26 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 09 17:52:27 2014 +0000
tree 873ef40f353b457ef7e159dd0b0396d6b1daf626
parent aa6ff6c7b0b576aa75cbd9fb5cdd95fa6cbc49bb
parent 689f70442c0cfedfc6825dc32549de7eeb35554b

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

core/java/android/net/ConnectivityManager.java

diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 4215f20..fa87c80 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -37,6 +37,7 @@
 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;
@@ -1295,9 +1296,15 @@
         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;
     }