Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expose TelephonyManager#{set,get}DataEnabled."

Browse Source 
am: 99d6227782

Change-Id: Iacdd6d802725ab1b45c273ad7c8de7c85c8cb801
This commit is contained in:
Jeff Davidson
2016-11-23 04:01:22 +00:00
committed by android-build-merger
parent 4cfb0f020f 99d6227782
commit fa8e6c0f5a
3 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -37380,6 +37380,7 @@ package android.telephony {
method public int getCallState();
method public android.telephony.CellLocation getCellLocation();
method public int getDataActivity();
method public boolean getDataEnabled();
method public int getDataNetworkType();
method public int getDataState();
method public java.lang.String getDeviceId();
@@ -37424,6 +37425,7 @@ package android.telephony {
method public boolean isWorldPhone();
method public void listen(android.telephony.PhoneStateListener, int);
method public java.lang.String sendEnvelopeWithStatus(java.lang.String);
method public void setDataEnabled(boolean);
method public boolean setLine1NumberForDisplay(java.lang.String, java.lang.String);
method public boolean setOperatorBrandOverride(java.lang.String);
method public boolean setPreferredNetworkTypeToGlobal();

2
api/test-current.txt
View File

@@ -37462,6 +37462,7 @@ package android.telephony {
method public int getCallState();
method public android.telephony.CellLocation getCellLocation();
method public int getDataActivity();
method public boolean getDataEnabled();
method public int getDataNetworkType();
method public int getDataState();
method public java.lang.String getDeviceId();
@@ -37506,6 +37507,7 @@ package android.telephony {
method public boolean isWorldPhone();
method public void listen(android.telephony.PhoneStateListener, int);
method public java.lang.String sendEnvelopeWithStatus(java.lang.String);
method public void setDataEnabled(boolean);
method public boolean setLine1NumberForDisplay(java.lang.String, java.lang.String);
method public boolean setOperatorBrandOverride(java.lang.String);
method public boolean setPreferredNetworkTypeToGlobal();

31
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -4765,10 +4765,19 @@ public class TelephonyManager {
return false;
}
/** @hide */
@SystemApi
/**
* Turns mobile data on or off.
*
* <p>Requires Permission:
* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} or that the
* calling app has carrier privileges.
*
* @param enable Whether to enable mobile data.
*
* @see #hasCarrierPrivileges
*/
public void setDataEnabled(boolean enable) {
setDataEnabled(SubscriptionManager.getDefaultDataSubscriptionId(), enable);
setDataEnabled(getSubId(), enable);
}
/** @hide */
@@ -4784,10 +4793,20 @@ public class TelephonyManager {
}
}
/** @hide */
@SystemApi
/**
* Returns whether mobile data is enabled or not.
*
* <p>Requires Permission:
* {@link android.Manifest.permission#ACCESS_NETWORK_STATE ACCESS_NETWORK_STATE},
* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}, or that the
* calling app has carrier privileges.
*
* @return true if mobile data is enabled.
*
* @see #hasCarrierPrivileges
*/
public boolean getDataEnabled() {
return getDataEnabled(SubscriptionManager.getDefaultDataSubscriptionId());
return getDataEnabled(getSubId());
}
/** @hide */