Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7abd26ae authored by Daniel Bright's avatar Daniel Bright Committed by Gerrit Code Review
Browse files

Merge "Undo isDataCapable as Public API"

parents 1656c8f1 21a5e8f7

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -45960,7 +45960,6 @@ 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.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 public boolean isEmergencyNumber(@NonNull String);

telephony/java/android/telephony/TelephonyManager.java

+2 −0
Original line number Diff line number Diff line
@@ -11048,6 +11048,8 @@ public class TelephonyManager { 
     * 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;