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

Commit d0a681eb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make isDataCapable a public API" am: 965d021b am: abed1c46 am: 1d40d065 am: 69cd0601 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629275

Change-Id: Ideddce7e4179fc1a076ae8dd244c3d31ab5d55fc
parents 8e4d4c05 69cd0601

core/api/current.txt

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

telephony/java/android/telephony/TelephonyManager.java

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