Merge "Merge "Marking some hidden API as TestApi." into pi-dev am: 50c069f7c1"... (fd8ca1db) · Commits · e / os / android_frameworks_base

api/test-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -823,6 +823,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 {

+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;