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

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

Merge "Undo isDataCapable as Public API" am: 7abd26ae 

Change-Id: Ib71163d76a1fc3af1eda1b5e41346c315e45a918
parents afecb43f 7abd26ae

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;