commit 9c28a90451edaf8e90d2d87f8142dc7a7ff1eb9d
author Etan Cohen <etancohen@google.com> Thu Jan 28 18:20:09 2016 +0000
committer Android Partner Code Review <android-gerrit-partner@google.com> Thu Jan 28 18:20:09 2016 +0000
tree 88c8c8e0d244d77f95ebb943b86cba279536ea00
parent 77d691763f640d5d5e3c1c6c086ecd706799c93e
parent 9786d92050dac1e0ffcfdf93bab7eb08592d90e2

Merge "Allow NetworkFactories to match any network specifier on a request" into mm-wireless-dev

core/java/android/net/ConnectivityManager.java

diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index ad9058f..8e91d2e 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -1460,7 +1460,7 @@
         if (b != null) {
             try {
                 ITelephony it = ITelephony.Stub.asInterface(b);
-                int subId = SubscriptionManager.getDefaultDataSubId();
+                int subId = SubscriptionManager.getDefaultDataSubscriptionId();
                 Log.d("ConnectivityManager", "getMobileDataEnabled()+ subId=" + subId);
                 boolean retVal = it.getDataEnabled(subId);
                 Log.d("ConnectivityManager", "getMobileDataEnabled()- subId=" + subId