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

Commit b6b02233 authored by Daniel Bright's avatar Daniel Bright Committed by Automerger Merge Worker
Browse files

Merge "Undo isDataCapable as Public API" into rvc-dev am: d9e5f80d am: 729c68c6 

Change-Id: I060de1e61a98a4f447538a3dca8d265c8de9f1f5
parents 308d157f 729c68c6

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -48214,7 +48214,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
@@ -11179,6 +11179,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;