diff options
| -rw-r--r-- | api/system-current.txt | 9 | ||||
| -rw-r--r-- | telephony/java/android/telephony/UiccSlotInfo.java | 84 |
2 files changed, 51 insertions, 42 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 2d3b65a19b26..2b32b9e43284 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -30,8 +30,8 @@ package android { field public static final java.lang.String BIND_RUNTIME_PERMISSION_PRESENTER_SERVICE = "android.permission.BIND_RUNTIME_PERMISSION_PRESENTER_SERVICE"; field public static final java.lang.String BIND_SETTINGS_SUGGESTIONS_SERVICE = "android.permission.BIND_SETTINGS_SUGGESTIONS_SERVICE"; field public static final java.lang.String BIND_TELEPHONY_DATA_SERVICE = "android.permission.BIND_TELEPHONY_DATA_SERVICE"; - field public static final java.lang.String BIND_TEXTCLASSIFIER_SERVICE = "android.permission.BIND_TEXTCLASSIFIER_SERVICE"; field public static final java.lang.String BIND_TELEPHONY_NETWORK_SERVICE = "android.permission.BIND_TELEPHONY_NETWORK_SERVICE"; + field public static final java.lang.String BIND_TEXTCLASSIFIER_SERVICE = "android.permission.BIND_TEXTCLASSIFIER_SERVICE"; field public static final java.lang.String BIND_TRUST_AGENT = "android.permission.BIND_TRUST_AGENT"; field public static final java.lang.String BIND_TV_REMOTE_SERVICE = "android.permission.BIND_TV_REMOTE_SERVICE"; field public static final java.lang.String BLUETOOTH_PRIVILEGED = "android.permission.BLUETOOTH_PRIVILEGED"; @@ -5035,22 +5035,19 @@ package android.telephony { } public class UiccSlotInfo implements android.os.Parcelable { - ctor public UiccSlotInfo(boolean, boolean, java.lang.String, int); + ctor public UiccSlotInfo(boolean, boolean, java.lang.String, int, int); method public int describeContents(); method public java.lang.String getCardId(); method public int getCardStateInfo(); method public boolean getIsActive(); method public boolean getIsEuicc(); + method public int getLogicalSlotIdx(); method public void writeToParcel(android.os.Parcel, int); field public static final int CARD_STATE_INFO_ABSENT = 1; // 0x1 field public static final int CARD_STATE_INFO_ERROR = 3; // 0x3 field public static final int CARD_STATE_INFO_PRESENT = 2; // 0x2 field public static final int CARD_STATE_INFO_RESTRICTED = 4; // 0x4 field public static final android.os.Parcelable.Creator<android.telephony.UiccSlotInfo> CREATOR; - field public final java.lang.String cardId; - field public final int cardStateInfo; - field public final boolean isActive; - field public final boolean isEuicc; } public abstract class VisualVoicemailService extends android.app.Service { diff --git a/telephony/java/android/telephony/UiccSlotInfo.java b/telephony/java/android/telephony/UiccSlotInfo.java index 0b3cbad0d2e2..0c17147ca3fa 100644 --- a/telephony/java/android/telephony/UiccSlotInfo.java +++ b/telephony/java/android/telephony/UiccSlotInfo.java @@ -55,10 +55,11 @@ public class UiccSlotInfo implements Parcelable { /** Card state restricted. */ public static final int CARD_STATE_INFO_RESTRICTED = 4; - public final boolean isActive; - public final boolean isEuicc; - public final String cardId; - public final @CardStateInfo int cardStateInfo; + private final boolean mIsActive; + private final boolean mIsEuicc; + private final String mCardId; + private final @CardStateInfo int mCardStateInfo; + private final int mLogicalSlotIdx; public static final Creator<UiccSlotInfo> CREATOR = new Creator<UiccSlotInfo>() { @Override @@ -73,18 +74,20 @@ public class UiccSlotInfo implements Parcelable { }; private UiccSlotInfo(Parcel in) { - isActive = in.readByte() != 0; - isEuicc = in.readByte() != 0; - cardId = in.readString(); - cardStateInfo = in.readInt(); + mIsActive = in.readByte() != 0; + mIsEuicc = in.readByte() != 0; + mCardId = in.readString(); + mCardStateInfo = in.readInt(); + mLogicalSlotIdx = in.readInt(); } @Override public void writeToParcel(Parcel dest, int flags) { - dest.writeByte((byte) (isActive ? 1 : 0)); - dest.writeByte((byte) (isEuicc ? 1 : 0)); - dest.writeString(cardId); - dest.writeInt(cardStateInfo); + dest.writeByte((byte) (mIsActive ? 1 : 0)); + dest.writeByte((byte) (mIsEuicc ? 1 : 0)); + dest.writeString(mCardId); + dest.writeInt(mCardStateInfo); + dest.writeInt(mLogicalSlotIdx); } @Override @@ -93,28 +96,33 @@ public class UiccSlotInfo implements Parcelable { } public UiccSlotInfo(boolean isActive, boolean isEuicc, String cardId, - @CardStateInfo int cardStateInfo) { - this.isActive = isActive; - this.isEuicc = isEuicc; - this.cardId = cardId; - this.cardStateInfo = cardStateInfo; + @CardStateInfo int cardStateInfo, int logicalSlotIdx) { + this.mIsActive = isActive; + this.mIsEuicc = isEuicc; + this.mCardId = cardId; + this.mCardStateInfo = cardStateInfo; + this.mLogicalSlotIdx = logicalSlotIdx; } public boolean getIsActive() { - return isActive; + return mIsActive; } public boolean getIsEuicc() { - return isEuicc; + return mIsEuicc; } public String getCardId() { - return cardId; + return mCardId; } @CardStateInfo public int getCardStateInfo() { - return cardStateInfo; + return mCardStateInfo; + } + + public int getLogicalSlotIdx() { + return mLogicalSlotIdx; } @Override @@ -127,32 +135,36 @@ public class UiccSlotInfo implements Parcelable { } UiccSlotInfo that = (UiccSlotInfo) obj; - return (isActive == that.isActive) - && (isEuicc == that.isEuicc) - && (cardId == that.cardId) - && (cardStateInfo == that.cardStateInfo); + return (mIsActive == that.mIsActive) + && (mIsEuicc == that.mIsEuicc) + && (mCardId == that.mCardId) + && (mCardStateInfo == that.mCardStateInfo) + && (mLogicalSlotIdx == that.mLogicalSlotIdx); } @Override public int hashCode() { int result = 1; - result = 31 * result + (isActive ? 1 : 0); - result = 31 * result + (isEuicc ? 1 : 0); - result = 31 * result + Objects.hashCode(cardId); - result = 31 * result + cardStateInfo; + result = 31 * result + (mIsActive ? 1 : 0); + result = 31 * result + (mIsEuicc ? 1 : 0); + result = 31 * result + Objects.hashCode(mCardId); + result = 31 * result + mCardStateInfo; + result = 31 * result + mLogicalSlotIdx; return result; } @Override public String toString() { - return "UiccSlotInfo (isActive=" - + isActive - + ", isEuicc=" - + isEuicc - + ", cardId=" - + cardId + return "UiccSlotInfo (mIsActive=" + + mIsActive + + ", mIsEuicc=" + + mIsEuicc + + ", mCardId=" + + mCardId + ", cardState=" - + cardStateInfo + + mCardStateInfo + + ", phoneId=" + + mLogicalSlotIdx + ")"; } } |