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

Undo isDataCapable as Public API

Browse Source 
Test: make
Bug: 146206136
Change-Id: I8b6a7e001c114df5e90668738b2a2b978e8757fa
This commit is contained in:
Daniel Bright
2020-03-13 15:13:27 -07:00
parent 27deb3b711
commit d9d7abb899
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -48207,7 +48207,6 @@ package android.telephony {
method @Deprecated public String iccTransmitApduBasicChannel(int, int, int, int, int, String); method @Deprecated public String iccTransmitApduBasicChannel(int, int, int, int, int, String);
method @Deprecated public String iccTransmitApduLogicalChannel(int, 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 isConcurrentVoiceAndDataSupported();
method public boolean isDataCapable();
method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.MODIFY_PHONE_STATE}) public boolean isDataEnabled(); method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.MODIFY_PHONE_STATE}) public boolean isDataEnabled();
method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isDataRoamingEnabled(); method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isDataRoamingEnabled();
method public boolean isEmergencyNumber(@NonNull String); method public boolean isEmergencyNumber(@NonNull String);
@@ -82234,3 +82233,4 @@ package org.xmlpull.v1.sax2 {
} }
} }

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

@@ -11158,6 +11158,8 @@ public class TelephonyManager {
* PackageManager.FEATURE_TELEPHONY system feature, which is available * PackageManager.FEATURE_TELEPHONY system feature, which is available
* on any device with a telephony radio, even if the device is * on any device with a telephony radio, even if the device is
* voice-only. * voice-only.
*
* @hide
*/ */
public boolean isDataCapable() { public boolean isDataCapable() {
if (mContext == null) return true; if (mContext == null) return true;