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

Commit 9f4ddb06 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by android-build-merger
Browse files

Merge "Merge "Marking some hidden API as TestApi." into pi-dev am: 50c069f7"... 

Merge "Merge "Marking some hidden API as TestApi." into pi-dev am: 50c069f7" into pi-dev-plus-aosp
am: fd8ca1db

Change-Id: I93d516f7a63bf2c3d8d2925bf287c4cba74b74f9
parents 165b66c2 fd8ca1db

api/test-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -868,6 +868,10 @@ package android.telephony { 


  public class ServiceState implements android.os.Parcelable {

    method public void setCdmaSystemAndNetworkId(int, int);

    method public void setCellBandwidths(int[]);

    method public void setChannelNumber(int);

    method public void setRilDataRadioTechnology(int);

    method public void setRilVoiceRadioTechnology(int);

  }



  public class TelephonyManager {

telephony/java/android/telephony/ServiceState.java

+4 −0
Original line number Diff line number Diff line
@@ -977,11 +977,13 @@ public class ServiceState implements Parcelable { 
    }



    /** @hide */

    @TestApi

    public void setCellBandwidths(int[] bandwidths) {

        mCellBandwidths = bandwidths;

    }



    /** @hide */

    @TestApi

    public void setChannelNumber(int channelNumber) {

        mChannelNumber = channelNumber;

    }
@@ -1172,6 +1174,7 @@ public class ServiceState implements Parcelable { 
    }



    /** @hide */

    @TestApi

    public void setRilVoiceRadioTechnology(int rt) {

        if (rt == RIL_RADIO_TECHNOLOGY_LTE_CA) {

            rt = RIL_RADIO_TECHNOLOGY_LTE;
@@ -1181,6 +1184,7 @@ public class ServiceState implements Parcelable { 
    }



    /** @hide */

    @TestApi

    public void setRilDataRadioTechnology(int rt) {

        if (rt == RIL_RADIO_TECHNOLOGY_LTE_CA) {

            rt = RIL_RADIO_TECHNOLOGY_LTE;