commit 0b2d583b45ee80cb4a207276dee0965ef9d98be8
author Sarah Chin <sarahchin@google.com> Thu Nov 19 22:01:46 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 19 22:01:46 2020 +0000
tree f8b6786fa526ba5dbacca6b2d40cbc9f3713253b
parent da498a524df70d52ef4a8dab6deeb36230f14db4
parent 5aa95e473251667de5d63bebd740711db4e912bf

Merge "Add TestApi for getSupportedRadioAccessFamily"

core/api/test-current.txt

diff --git a/core/api/test-current.txt b/core/api/test-current.txt
index 6aaf973..fc27d06 100644
--- a/core/api/test-current.txt
+++ b/core/api/test-current.txt
@@ -1673,6 +1673,7 @@
     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

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 7968700..f0274ca 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -11846,12 +11846,13 @@
      * @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;