diff options
| author | 2019-03-23 01:03:31 +0000 | |
|---|---|---|
| committer | 2019-03-23 01:03:31 +0000 | |
| commit | e1dda15d6c1380ba0c6941b5454dcdccd85b5f11 (patch) | |
| tree | 717d518988b3d69495be52c37bc6aef334270581 | |
| parent | 00ccf23ebdf660e30ed468938e7f64ee774e1594 (diff) | |
| parent | e19048e52b9db21f86982ec0341a30083b3b9f97 (diff) | |
Merge "Annotate Data and Voice Roaming setters with @TestApi."
| -rw-r--r-- | api/test-current.txt | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/ServiceState.java | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/api/test-current.txt b/api/test-current.txt index 3c0a75eb5bc6..905f753b69ac 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -1505,8 +1505,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 a500eba9fa2b..b0417b328f0e 100644 --- a/telephony/java/android/telephony/ServiceState.java +++ b/telephony/java/android/telephony/ServiceState.java @@ -1132,7 +1132,7 @@ public class ServiceState implements Parcelable { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) + @TestApi public void setVoiceRoamingType(@RoamingType int type) { NetworkRegistrationInfo regState = getNetworkRegistrationInfo( NetworkRegistrationInfo.DOMAIN_CS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN); @@ -1153,7 +1153,7 @@ public class ServiceState implements Parcelable { } /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) + @TestApi public void setDataRoamingType(@RoamingType int type) { NetworkRegistrationInfo regState = getNetworkRegistrationInfo( NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN); |