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

Commit 1a7ff7db authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Add TestApi for getSupportedRadioAccessFamily" am: 0b2d583b 

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

Change-Id: Iffa79004c4414c913c660e7cc2b22dd36adb5369
parents f6aaaadd 0b2d583b

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1673,6 +1673,7 @@ package android.telephony { 
    method @NonNull public java.util.List<android.telephony.data.ApnSetting> getDevicePolicyOverrideApns(@NonNull android.content.Context);

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getLine1AlphaTag();

    method public android.util.Pair<java.lang.Integer,java.lang.Integer> getRadioHalVersion();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getSupportedRadioAccessFamily();

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

    method public boolean modifyDevicePolicyOverrideApn(@NonNull android.content.Context, int, @NonNull android.telephony.data.ApnSetting);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void refreshUiccProfile();

telephony/java/android/telephony/TelephonyManager.java

+2 −1
Original line number Diff line number Diff line
@@ -11846,12 +11846,13 @@ public class TelephonyManager { 
     * @hide

     */

    @SystemApi

    @TestApi

    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    public @NetworkTypeBitMask long getSupportedRadioAccessFamily() {

        try {

            ITelephony telephony = getITelephony();

            if (telephony != null) {

                return (long) telephony.getRadioAccessFamily(getSlotIndex(), getOpPackageName());

                return telephony.getRadioAccessFamily(getSlotIndex(), getOpPackageName());

            } else {

                // This can happen when the ITelephony interface is not up yet.

                return NETWORK_TYPE_BITMASK_UNKNOWN;