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

Commit c028f7a5 authored by Cody Kesting's avatar Cody Kesting Committed by android-build-merger
Browse files

Merge "Annotate Data and Voice Roaming setters with @TestApi." 

am: e1dda15d

Change-Id: I450069925ec6b931d88c964aba4975167531d93d
parents 187bd825 e1dda15d

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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 {

telephony/java/android/telephony/ServiceState.java

+2 −2
Original line number Diff line number Diff line
@@ -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);