Merge "Renamed getNetworkId and getSystemId" into pi-dev (a4bc10ab) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -42821,17 +42821,17 @@ package android.telephony {
		ctor public ServiceState(android.os.Parcel);
		method protected void copyFrom(android.telephony.ServiceState);
		method public int describeContents();
		method public int getCdmaNetworkId();
		method public int getCdmaSystemId();
		method public int[] getCellBandwidths();
		method public int getChannelNumber();
		method public int getDuplexMode();
		method public boolean getIsManualSelection();
		method public int getNetworkId();
		method public java.lang.String getOperatorAlphaLong();
		method public java.lang.String getOperatorAlphaShort();
		method public java.lang.String getOperatorNumeric();
		method public boolean getRoaming();
		method public int getState();
		method public int getSystemId();
		method public void setIsManualSelection(boolean);
		method public void setOperatorName(java.lang.String, java.lang.String, java.lang.String);
		method public void setRoaming(boolean);

+1 −1

Original line number	Diff line number	Diff line
		@@ -759,7 +759,7 @@ package android.telephony {
		}

		public class ServiceState implements android.os.Parcelable {
		method public void setSystemAndNetworkId(int, int);
		method public void setCdmaSystemAndNetworkId(int, int);
		}

		}

+4 −4

Original line number	Diff line number	Diff line
		@@ -3165,8 +3165,8 @@ public final class Telephony {
		values.put(RIL_VOICE_RADIO_TECHNOLOGY, state.getRilVoiceRadioTechnology());
		values.put(RIL_DATA_RADIO_TECHNOLOGY, state.getRilDataRadioTechnology());
		values.put(CSS_INDICATOR, state.getCssIndicator());
		values.put(NETWORK_ID, state.getNetworkId());
		values.put(SYSTEM_ID, state.getSystemId());
		values.put(NETWORK_ID, state.getCdmaNetworkId());
		values.put(SYSTEM_ID, state.getCdmaSystemId());
		values.put(CDMA_ROAMING_INDICATOR, state.getCdmaRoamingIndicator());
		values.put(CDMA_DEFAULT_ROAMING_INDICATOR, state.getCdmaDefaultRoamingIndicator());
		values.put(CDMA_ERI_ICON_INDEX, state.getCdmaEriIconIndex());
		@@ -3296,13 +3296,13 @@ public final class Telephony {
		public static final String CSS_INDICATOR = "css_indicator";

		/**
		* This is the same as {@link ServiceState#getNetworkId()}.
		* This is the same as {@link ServiceState#getCdmaNetworkId()}.
		* @hide
		*/
		public static final String NETWORK_ID = "network_id";

		/**
		* This is the same as {@link ServiceState#getSystemId()}.
		* This is the same as {@link ServiceState#getCdmaSystemId()}.
		* @hide
		*/
		public static final String SYSTEM_ID = "system_id";

+4 −4

Original line number	Diff line number	Diff line
		@@ -221,7 +221,7 @@ public class ServiceState implements Parcelable {
		public static final int ROAMING_TYPE_INTERNATIONAL = 3;

		/**
		* Unknown ID. Could be returned by {@link #getNetworkId()} or {@link #getSystemId()}
		* Unknown ID. Could be returned by {@link #getCdmaNetworkId()} or {@link #getCdmaSystemId()}
		*/
		public static final int UNKNOWN_ID = -1;

		@@ -1222,7 +1222,7 @@ public class ServiceState implements Parcelable {

		/** @hide */
		@TestApi
		public void setSystemAndNetworkId(int systemId, int networkId) {
		public void setCdmaSystemAndNetworkId(int systemId, int networkId) {
		this.mSystemId = systemId;
		this.mNetworkId = networkId;
		}
		@@ -1388,7 +1388,7 @@ public class ServiceState implements Parcelable {
		* within a wireless system. (Defined in 3GPP2 C.S0023 3.4.8)
		* @return The CDMA NID or {@link #UNKNOWN_ID} if not available.
		*/
		public int getNetworkId() {
		public int getCdmaNetworkId() {
		return this.mNetworkId;
		}

		@@ -1397,7 +1397,7 @@ public class ServiceState implements Parcelable {
		* system. (Defined in 3GPP2 C.S0023 3.4.8)
		* @return The CDMA SID or {@link #UNKNOWN_ID} if not available.
		*/
		public int getSystemId() {
		public int getCdmaSystemId() {
		return this.mSystemId;
		}