Merge "Add isMobileDataEnabled in TelephonyManager." am: 278fb634c1

am: 6b943d5deb

Change-Id: I132cc6d3de77f20717a40884683fb0c81fbb7083
This commit is contained in:
Malcolm Chen
2018-01-10 00:06:27 +00:00
committed by android-build-merger

View File

@@ -1794,7 +1794,7 @@ public class ConnectivityManager {
ITelephony it = ITelephony.Stub.asInterface(b); ITelephony it = ITelephony.Stub.asInterface(b);
int subId = SubscriptionManager.getDefaultDataSubscriptionId(); int subId = SubscriptionManager.getDefaultDataSubscriptionId();
Log.d("ConnectivityManager", "getMobileDataEnabled()+ subId=" + subId); Log.d("ConnectivityManager", "getMobileDataEnabled()+ subId=" + subId);
boolean retVal = it.getDataEnabled(subId); boolean retVal = it.isUserDataEnabled(subId);
Log.d("ConnectivityManager", "getMobileDataEnabled()- subId=" + subId Log.d("ConnectivityManager", "getMobileDataEnabled()- subId=" + subId
+ " retVal=" + retVal); + " retVal=" + retVal);
return retVal; return retVal;