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

Commit b4fbce22 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add TestApi for getSupportedRadioAccessFamily"

parents bb2bf53c 9d0b903e

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1802,6 +1802,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 public boolean modifyDevicePolicyOverrideApn(@NonNull android.content.Context, int, @NonNull android.telephony.data.ApnSetting);

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

    method @Deprecated public void setCarrierTestOverride(String, String, String, String, String, String, String);

telephony/java/android/telephony/TelephonyManager.java

+2 −1
Original line number Diff line number Diff line
@@ -12015,12 +12015,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;