Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Exposed CDMA SID/NID get APIs" am: 0cb936a855

Browse Source 
am: 46ffa48122

Change-Id: I4693b44d59a312def9f26ad54badd5533cd36dfd
This commit is contained in:
Jack Yu
2018-01-10 02:39:54 +00:00
committed by android-build-merger
parent 8ca799e22f 46ffa48122
commit e936a81557
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/current.txt
View File

@@ -40472,11 +40472,13 @@ package android.telephony {
method protected void copyFrom(android.telephony.ServiceState);
method public int describeContents();
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);
@@ -40489,6 +40491,7 @@ package android.telephony {
field public static final int STATE_IN_SERVICE = 0; // 0x0
field public static final int STATE_OUT_OF_SERVICE = 1; // 0x1
field public static final int STATE_POWER_OFF = 3; // 0x3
field public static final int UNKNOWN_ID = -1; // 0xffffffff
}
public class SignalStrength implements android.os.Parcelable {

18
telephony/java/android/telephony/ServiceState.java
View File

@@ -20,7 +20,6 @@ import android.annotation.IntDef;
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
import android.telephony.Rlog;
import android.text.TextUtils;
import java.lang.annotation.Retention;
@@ -251,6 +250,11 @@ public class ServiceState implements Parcelable {
*/
public static final int ROAMING_TYPE_INTERNATIONAL = 3;
/**
* Unknown ID. Could be returned by {@link #getNetworkId()} or {@link #getSystemId()}
*/
public static final int UNKNOWN_ID = -1;
private int mVoiceRoamingType;
private int mDataRoamingType;
private String mVoiceOperatorAlphaLong;
@@ -1248,12 +1252,20 @@ public class ServiceState implements Parcelable {
return this.mCssIndicator ? 1 : 0;
}
/** @hide */
/**
* Get the CDMA NID (Network Identification Number), a number uniquely identifying a network
* 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() {
return this.mNetworkId;
}
/** @hide */
/**
* Get the CDMA SID (System Identification Number), a number uniquely identifying a wireless
* system. (Defined in 3GPP2 C.S0023 3.4.8)
* @return The CDMA SID or {@link #UNKNOWN_ID} if not available.
*/
public int getSystemId() {
return this.mSystemId;
}