Add TestApi for getSupportedRadioAccessFamily

Test: atest TelephonyManagerTest
Fix: 172060765
Change-Id: I7d1e2973bc42f04ab0d28752bce9ed8fa93fdba9
This commit is contained in:
Sarah Chin
2020-11-02 13:33:16 -08:00
parent 6e59ac63ff
commit 9d0b903e36
2 changed files with 3 additions and 1 deletions

View File

@@ -1793,6 +1793,7 @@ package android.telephony {
method @NonNull public java.util.List<android.telephony.data.ApnSetting> getDevicePolicyOverrideApns(@NonNull android.content.Context); 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 @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getLine1AlphaTag();
method public android.util.Pair<java.lang.Integer,java.lang.Integer> getRadioHalVersion(); 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 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 @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void refreshUiccProfile();
method @Deprecated public void setCarrierTestOverride(String, String, String, String, String, String, String); method @Deprecated public void setCarrierTestOverride(String, String, String, String, String, String, String);

View File

@@ -12015,12 +12015,13 @@ public class TelephonyManager {
* @hide * @hide
*/ */
@SystemApi @SystemApi
@TestApi
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public @NetworkTypeBitMask long getSupportedRadioAccessFamily() { public @NetworkTypeBitMask long getSupportedRadioAccessFamily() {
try { try {
ITelephony telephony = getITelephony(); ITelephony telephony = getITelephony();
if (telephony != null) { if (telephony != null) {
return (long) telephony.getRadioAccessFamily(getSlotIndex(), getOpPackageName()); return telephony.getRadioAccessFamily(getSlotIndex(), getOpPackageName());
} else { } else {
// This can happen when the ITelephony interface is not up yet. // This can happen when the ITelephony interface is not up yet.
return NETWORK_TYPE_BITMASK_UNKNOWN; return NETWORK_TYPE_BITMASK_UNKNOWN;