Merge "Add API to check extended APDU Supported" (fd4385e6) · Commits · e / os / android_frameworks_base

api/system-current.txt

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4357,12 +4357,13 @@ package android.telephony {
	}		}

	public class UiccSlotInfo implements android.os.Parcelable {		public class UiccSlotInfo implements android.os.Parcelable {
	ctor public UiccSlotInfo(boolean, boolean, java.lang.String, int, int);		ctor public UiccSlotInfo(boolean, boolean, java.lang.String, int, int, boolean);
	method public int describeContents();		method public int describeContents();
	method public java.lang.String getCardId();		method public java.lang.String getCardId();
	method public int getCardStateInfo();		method public int getCardStateInfo();
	method public boolean getIsActive();		method public boolean getIsActive();
	method public boolean getIsEuicc();		method public boolean getIsEuicc();
			method public boolean getIsExtendedApduSupported();
	method public int getLogicalSlotIdx();		method public int getLogicalSlotIdx();
	method public void writeToParcel(android.os.Parcel, int);		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_ABSENT = 1; // 0x1

telephony/java/android/telephony/UiccSlotInfo.java

+17 −2

Original line number	Original line	Diff line number	Diff line
	@@ -60,6 +60,7 @@ public class UiccSlotInfo implements Parcelable {
	private final String mCardId;		private final String mCardId;
	private final @CardStateInfo int mCardStateInfo;		private final @CardStateInfo int mCardStateInfo;
	private final int mLogicalSlotIdx;		private final int mLogicalSlotIdx;
			private final boolean mIsExtendedApduSupported;

	public static final Creator<UiccSlotInfo> CREATOR = new Creator<UiccSlotInfo>() {		public static final Creator<UiccSlotInfo> CREATOR = new Creator<UiccSlotInfo>() {
	@Override		@Override
	@@ -79,6 +80,7 @@ public class UiccSlotInfo implements Parcelable {
	mCardId = in.readString();		mCardId = in.readString();
	mCardStateInfo = in.readInt();		mCardStateInfo = in.readInt();
	mLogicalSlotIdx = in.readInt();		mLogicalSlotIdx = in.readInt();
			mIsExtendedApduSupported = in.readByte() != 0;
	}		}

	@Override		@Override
	@@ -88,6 +90,7 @@ public class UiccSlotInfo implements Parcelable {
	dest.writeString(mCardId);		dest.writeString(mCardId);
	dest.writeInt(mCardStateInfo);		dest.writeInt(mCardStateInfo);
	dest.writeInt(mLogicalSlotIdx);		dest.writeInt(mLogicalSlotIdx);
			dest.writeByte((byte) (mIsExtendedApduSupported ? 1 : 0));
	}		}

	@Override		@Override
	@@ -96,12 +99,13 @@ public class UiccSlotInfo implements Parcelable {
	}		}

	public UiccSlotInfo(boolean isActive, boolean isEuicc, String cardId,		public UiccSlotInfo(boolean isActive, boolean isEuicc, String cardId,
	@CardStateInfo int cardStateInfo, int logicalSlotIdx) {		@CardStateInfo int cardStateInfo, int logicalSlotIdx, boolean isExtendedApduSupported) {
	this.mIsActive = isActive;		this.mIsActive = isActive;
	this.mIsEuicc = isEuicc;		this.mIsEuicc = isEuicc;
	this.mCardId = cardId;		this.mCardId = cardId;
	this.mCardStateInfo = cardStateInfo;		this.mCardStateInfo = cardStateInfo;
	this.mLogicalSlotIdx = logicalSlotIdx;		this.mLogicalSlotIdx = logicalSlotIdx;
			this.mIsExtendedApduSupported = isExtendedApduSupported;
	}		}

	public boolean getIsActive() {		public boolean getIsActive() {
	@@ -125,6 +129,13 @@ public class UiccSlotInfo implements Parcelable {
	return mLogicalSlotIdx;		return mLogicalSlotIdx;
	}		}

			/**
			* @return {@code true} if this slot supports extended APDU from ATR, {@code false} otherwise.
			*/
			public boolean getIsExtendedApduSupported() {
			return mIsExtendedApduSupported;
			}

	@Override		@Override
	public boolean equals(Object obj) {		public boolean equals(Object obj) {
	if (this == obj) {		if (this == obj) {
	@@ -139,7 +150,8 @@ public class UiccSlotInfo implements Parcelable {
	&& (mIsEuicc == that.mIsEuicc)		&& (mIsEuicc == that.mIsEuicc)
	&& (mCardId == that.mCardId)		&& (mCardId == that.mCardId)
	&& (mCardStateInfo == that.mCardStateInfo)		&& (mCardStateInfo == that.mCardStateInfo)
	&& (mLogicalSlotIdx == that.mLogicalSlotIdx);		&& (mLogicalSlotIdx == that.mLogicalSlotIdx)
			&& (mIsExtendedApduSupported == that.mIsExtendedApduSupported);
	}		}

	@Override		@Override
	@@ -150,6 +162,7 @@ public class UiccSlotInfo implements Parcelable {
	result = 31 * result + Objects.hashCode(mCardId);		result = 31 * result + Objects.hashCode(mCardId);
	result = 31 * result + mCardStateInfo;		result = 31 * result + mCardStateInfo;
	result = 31 * result + mLogicalSlotIdx;		result = 31 * result + mLogicalSlotIdx;
			result = 31 * result + (mIsExtendedApduSupported ? 1 : 0);
	return result;		return result;
	}		}

	@@ -165,6 +178,8 @@ public class UiccSlotInfo implements Parcelable {
	+ mCardStateInfo		+ mCardStateInfo
	+ ", phoneId="		+ ", phoneId="
	+ mLogicalSlotIdx		+ mLogicalSlotIdx
			+ ", mIsExtendedApduSupported="
			+ mIsExtendedApduSupported
	+ ")";		+ ")";
	}		}
	}		}