diff options
| -rw-r--r-- | api/current.txt | 4 | ||||
| -rw-r--r-- | api/test-current.txt | 2 | ||||
| -rw-r--r-- | telephony/java/android/provider/Telephony.java | 8 | ||||
| -rw-r--r-- | telephony/java/android/telephony/ServiceState.java | 8 |
4 files changed, 11 insertions, 11 deletions
diff --git a/api/current.txt b/api/current.txt index 398fc3f53ac2..9c0e630355fc 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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); diff --git a/api/test-current.txt b/api/test-current.txt index 54ddd5de7969..3ddbdba07f3e 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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); } } diff --git a/telephony/java/android/provider/Telephony.java b/telephony/java/android/provider/Telephony.java index 4f78c4cc78ad..f1653ce6c2ae 100644 --- a/telephony/java/android/provider/Telephony.java +++ b/telephony/java/android/provider/Telephony.java @@ -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"; diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java index a9c1cf6c7bc3..9c831b9be0dd 100644 --- a/telephony/java/android/telephony/ServiceState.java +++ b/telephony/java/android/telephony/ServiceState.java @@ -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; } |