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

Commit 1e83a9ea authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Make isDataCapable a public API" am: bdee4edb 

Change-Id: Icc763a920ec7e6ad780da7b70bd585f80e126454
parents 49232cca bdee4edb

api/current.txt

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

telephony/java/android/telephony/TelephonyManager.java

+9 −3
Original line number Original line Diff line number Diff line
@@ -11011,9 +11011,15 @@ public class TelephonyManager { 
    }

    }





    /**

    /**

     * Checks if FEATURE_TELEPHONY_DATA is enabled.

     * @return true if the current device is "data capable" over a radio on the device.

     *

     * <p>

     * @hide

     * "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.

     */

     */

    public boolean isDataCapable() {

    public boolean isDataCapable() {

        if (mContext == null) return true;

        if (mContext == null) return true;