Annotate Data and Voice Roaming setters with @TestApi.

CTS testing for ServiceState's getRoaming() requires using
setDataRoamingType() and setVoiceRoamingType() for preparing state.
These are currently annotated as @hide and @UnsupportedAppUsage, with a
maxTargetSdk of P.

Bug: 74207290
Test: atest CtsTelephonyTestCases:ServiceStateTest
Change-Id: I08efeeae81494c0431ce34c5d68a73d4824c8d1d

diff --git a/api/test-current.txt b/api/test-current.txt
index bf5ccd0..4a0cbba 100644 (file)
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -1502,8 +1502,10 @@ package android.telephony {
     method public void setCdmaSystemAndNetworkId(int, int);
     method public void setCellBandwidths(int[]);
     method public void setChannelNumber(int);
+    method public void setDataRoamingType(int);
     method public void setRilDataRadioTechnology(int);
     method public void setRilVoiceRadioTechnology(int);
+    method public void setVoiceRoamingType(int);
   }
 
   public class TelephonyManager {

diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
index 4b15aac..49a04c9 100644 (file)
--- a/telephony/java/android/telephony/ServiceState.java
+++ b/telephony/java/android/telephony/ServiceState.java
@@ -1128,7 +1128,7 @@ public class ServiceState implements Parcelable {
     }
 
     /** @hide */
-    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
+    @TestApi
     public void setVoiceRoamingType(@RoamingType int type) {
         NetworkRegistrationState regState = getNetworkRegistrationState(
                 NetworkRegistrationState.DOMAIN_CS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
@@ -1149,7 +1149,7 @@ public class ServiceState implements Parcelable {
     }
 
     /** @hide */
-    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
+    @TestApi
     public void setDataRoamingType(@RoamingType int type) {
         NetworkRegistrationState regState = getNetworkRegistrationState(
                 NetworkRegistrationState.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN);