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

Merge "Make isDataCapable a public API" am: 965d021bf5 am: abed1c46be am: 1d40d06532

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629275

Change-Id: I8b83100d8d3945538b8fee0860bcf1d7cbbcaa91
This commit is contained in:
Treehugger Robot
2021-03-22 13:25:10 +00:00
committed by Automerger Merge Worker
parent 60a2143239 1d40d06532
commit 69cd06014d
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -42373,6 +42373,7 @@ package android.telephony {
method @Deprecated public String iccTransmitApduBasicChannel(int, int, int, int, int, String);
method @Deprecated public String iccTransmitApduLogicalChannel(int, int, int, int, int, int, String);
method public boolean isConcurrentVoiceAndDataSupported();
method public boolean isDataCapable();
method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.READ_PHONE_STATE, "android.permission.READ_PRIVILEGED_PHONE_STATE"}) public boolean isDataConnectionAllowed();
method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isDataEnabled();
method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isDataEnabledForReason(int);

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

@@ -12388,12 +12388,6 @@ public class TelephonyManager {
* "Data capable" means that this device supports packet-switched
* data connections over the telephony network.
* <p>
* Note: the meaning of this flag is subtly different from the
* PackageManager.FEATURE_TELEPHONY system feature, which is available
* on any device with a telephony radio, even if the device is
* voice-only.
*
* @hide
*/
public boolean isDataCapable() {
if (mContext == null) return true;