Merge "Add p2 option in openLogicalChannel." into oc-dev (682ce663) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -40120,7 +40120,8 @@ package android.telephony {
		method public boolean hasIccCard();
		method public boolean iccCloseLogicalChannel(int);
		method public byte[] iccExchangeSimIO(int, int, int, int, int, java.lang.String);
		method public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(java.lang.String);
		method public deprecated android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(java.lang.String);
		method public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(java.lang.String, int);
		method public java.lang.String iccTransmitApduBasicChannel(int, int, int, int, int, java.lang.String);
		method public java.lang.String iccTransmitApduLogicalChannel(int, int, int, int, int, int, java.lang.String);
		method public boolean isConcurrentVoiceAndDataSupported();

api/system-current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -43620,7 +43620,8 @@ package android.telephony {
		method public boolean hasIccCard();
		method public boolean iccCloseLogicalChannel(int);
		method public byte[] iccExchangeSimIO(int, int, int, int, int, java.lang.String);
		method public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(java.lang.String);
		method public deprecated android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(java.lang.String);
		method public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(java.lang.String, int);
		method public java.lang.String iccTransmitApduBasicChannel(int, int, int, int, int, java.lang.String);
		method public java.lang.String iccTransmitApduLogicalChannel(int, int, int, int, int, int, java.lang.String);
		method public boolean isConcurrentVoiceAndDataSupported();

api/test-current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -40321,7 +40321,8 @@ package android.telephony {
		method public boolean hasIccCard();
		method public boolean iccCloseLogicalChannel(int);
		method public byte[] iccExchangeSimIO(int, int, int, int, int, java.lang.String);
		method public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(java.lang.String);
		method public deprecated android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(java.lang.String);
		method public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(java.lang.String, int);
		method public java.lang.String iccTransmitApduBasicChannel(int, int, int, int, int, java.lang.String);
		method public java.lang.String iccTransmitApduLogicalChannel(int, int, int, int, int, int, java.lang.String);
		method public boolean isConcurrentVoiceAndDataSupported();

telephony/java/android/telephony/TelephonyManager.java

+23 −3

Original line number	Diff line number	Diff line
		@@ -3650,9 +3650,28 @@ public class TelephonyManager {
		*
		* @param AID Application id. See ETSI 102.221 and 101.220.
		* @return an IccOpenLogicalChannelResponse object.
		* @deprecated Replaced by {@link #iccOpenLogicalChannel(String, int)}
		*/
		@Deprecated
		public IccOpenLogicalChannelResponse iccOpenLogicalChannel(String AID) {
		return iccOpenLogicalChannel(getSubId(), AID);
		return iccOpenLogicalChannel(getSubId(), AID, -1);
		}

		/**
		* Opens a logical channel to the ICC card.
		*
		* Input parameters equivalent to TS 27.007 AT+CCHO command.
		*
		* <p>Requires Permission:
		* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}
		* Or the calling app has carrier privileges. @see #hasCarrierPrivileges
		*
		* @param AID Application id. See ETSI 102.221 and 101.220.
		* @param p2 P2 parameter (described in ISO 7816-4).
		* @return an IccOpenLogicalChannelResponse object.
		*/
		public IccOpenLogicalChannelResponse iccOpenLogicalChannel(String AID, int p2) {
		return iccOpenLogicalChannel(getSubId(), AID, p2);
		}

		/**
		@@ -3666,14 +3685,15 @@ public class TelephonyManager {
		*
		* @param subId The subscription to use.
		* @param AID Application id. See ETSI 102.221 and 101.220.
		* @param p2 P2 parameter (described in ISO 7816-4).
		* @return an IccOpenLogicalChannelResponse object.
		* @hide
		*/
		public IccOpenLogicalChannelResponse iccOpenLogicalChannel(int subId, String AID) {
		public IccOpenLogicalChannelResponse iccOpenLogicalChannel(int subId, String AID, int p2) {
		try {
		ITelephony telephony = getITelephony();
		if (telephony != null)
		return telephony.iccOpenLogicalChannel(subId, AID);
		return telephony.iccOpenLogicalChannel(subId, AID, p2);
		} catch (RemoteException ex) {
		} catch (NullPointerException ex) {
		}

telephony/java/com/android/internal/telephony/ITelephony.aidl

+2 −1

Original line number	Diff line number	Diff line
		@@ -623,9 +623,10 @@ interface ITelephony {
		*
		* @param subId The subscription to use.
		* @param AID Application id. See ETSI 102.221 and 101.220.
		* @param p2 P2 parameter (described in ISO 7816-4).
		* @return an IccOpenLogicalChannelResponse object.
		*/
		IccOpenLogicalChannelResponse iccOpenLogicalChannel(int subId, String AID);
		IccOpenLogicalChannelResponse iccOpenLogicalChannel(int subId, String AID, int p2);

		/**
		* Closes a previously opened logical channel to the ICC card.