diff options
| author | 2021-03-22 13:25:10 +0000 | |
|---|---|---|
| committer | 2021-03-22 13:25:10 +0000 | |
| commit | 69cd06014dcf2d6aa40aed0e0f4772348ce3e581 (patch) | |
| tree | 8888b05ab63ef4aa6648eef81a98cc03200ad162 | |
| parent | 60a214323948a3fa5a7100df1b10b33f981a44f0 (diff) | |
| parent | 1d40d06532d2a8df293376b75d4272399ef4005a (diff) | |
Merge "Make isDataCapable a public API" am: 965d021bf5 am: abed1c46be am: 1d40d06532
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629275
Change-Id: I8b83100d8d3945538b8fee0860bcf1d7cbbcaa91
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index d245732407b4..93cc85accf96 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -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); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 06efc29eb8f8..a7f62042b60c 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -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; |