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

Commit 99bf1aa1 authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Merge "Make isDataEnabledForApn() a system api." 

am: 7ab5b492

Change-Id: I7e146b5908fdb71165b21327a4da2b677b2540b4
parents f6a1a0c8 7ab5b492

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8201,6 +8201,7 @@ package android.telephony { 
    method @Nullable @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String iccTransmitApduLogicalChannelBySlot(int, int, int, int, int, int, int, @Nullable String);

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isApplicationOnUicc(int);

    method public boolean isDataConnectivityPossible();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isDataEnabledForApn(int);

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isEmergencyAssistanceEnabled();

    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isIdle();

    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isOffhook();

telephony/java/android/telephony/TelephonyManager.java

+3 −0
Original line number Diff line number Diff line
@@ -11488,10 +11488,13 @@ public class TelephonyManager { 
     *  3) APN type is whitelisted. E.g. MMS is whitelisted if

     *  {@link SubscriptionManager#setAlwaysAllowMmsData} is turned on.

     *

     * @param apnType Value indicating the apn type. Apn types are defined in {@link ApnSetting}.

     * @return whether data is enabled for a apn type.

     *

     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    public boolean isDataEnabledForApn(@ApnSetting.ApnType int apnType) {

        String pkgForDebug = mContext != null ? mContext.getOpPackageName() : "<unknown>";

        try {