summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
Diffstat (limited to 'telephony')
-rw-r--r--telephony/java/android/telephony/TelephonyManager.java44
-rw-r--r--telephony/java/com/android/internal/telephony/ITelephony.aidl20
-rwxr-xr-xtelephony/java/com/android/internal/telephony/RILConstants.java1
3 files changed, 65 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 7afaf7e..5ec6950 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -3069,6 +3069,50 @@ public class TelephonyManager {
}
/**
+ * Opens a logical channel to the ICC card
+ *
+ * Input parameters equivalent to TS 27.007 AT+CCHO command.
+ *
+ * @param AID application id. See ETSI 102.221 and 101.220.
+ * @param p2 byte P2 parameter
+ * @return an IccOpenLogicalChannelResponse object
+ * @hide
+ */
+ public IccOpenLogicalChannelResponse iccOpenLogicalChannel(String AID, byte p2) {
+ try {
+ ITelephony telephony = getITelephony();
+ if (telephony != null) {
+ return telephony.iccOpenLogicalChannelWithP2(AID, p2);
+ }
+ } catch (RemoteException ex) {
+ } catch (NullPointerException ex) {
+ }
+ return null;
+ }
+
+ /**
+ * Opens a logical channel to the ICC card for the given subId
+ *
+ * @param subId subid to send the command to
+ * @param AID applcation id. See ETSI 102.221 and 101.220.
+ * @param p2 byte P2 parameter
+ * @return an IccOpenLogicalChannelResponse object
+ * @hide
+ */
+ public IccOpenLogicalChannelResponse iccOpenLogicalChannel(int subId,
+ String AID, byte p2) {
+ try {
+ ITelephony telephony = getITelephony();
+ if (telephony != null) {
+ return telephony.iccOpenLogicalChannelUsingSubIdWithP2(subId, AID, p2);
+ }
+ } catch (RemoteException ex) {
+ } catch (NullPointerException ex) {
+ }
+ return null;
+ }
+
+ /**
* Closes a previously opened logical channel to the ICC card.
*
* Input parameters equivalent to TS 27.007 AT+CCHC command.
diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl
index c3db8c2..291ce27 100644
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
@@ -570,6 +570,16 @@ interface ITelephony {
*/
IccOpenLogicalChannelResponse iccOpenLogicalChannel(String AID);
+ /**
+ * Opens a logical channel to the ICC card.
+ *
+ * Input parameters equivalent to TS 27.007 AT+CCHO command.
+ *
+ * @param p2 P2 parameter
+ * @param AID Application id.
+ * @return an IccOpenLogicalChannelResponse object.
+ */
+ IccOpenLogicalChannelResponse iccOpenLogicalChannelWithP2(String AID, byte p2);
/**
* Opens a logical channel to the ICC card for a particular subId.
@@ -583,6 +593,16 @@ interface ITelephony {
IccOpenLogicalChannelResponse iccOpenLogicalChannelUsingSubId(int subId, String AID);
/**
+ * Opens a logical channel to the ICC card for a particular subID
+ *
+ * @param subId user preferred subId.
+ * @param p2 P2 parameter
+ * @param AID Application id. See ETSI 102.221 and 101.220
+ */
+ IccOpenLogicalChannelResponse iccOpenLogicalChannelUsingSubIdWithP2(int subId,
+ String AID, byte p2);
+
+ /**
* Closes a previously opened logical channel to the ICC card.
*
* Input parameters equivalent to TS 27.007 AT+CCHC command.
diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java
index 7131c33..216dd38 100755
--- a/telephony/java/com/android/internal/telephony/RILConstants.java
+++ b/telephony/java/com/android/internal/telephony/RILConstants.java
@@ -335,6 +335,7 @@ cat include/telephony/ril.h | \
int RIL_REQUEST_PULL_LCEDATA = 134;
int RIL_REQUEST_GET_ACTIVITY_INFO = 135;
int RIL_REQUEST_SIM_GET_ATR = 136;
+ int RIL_REQUEST_CAF_SIM_OPEN_CHANNEL_WITH_P2 = 137;
int RIL_REQUEST_SET_MAX_TRANSMIT_POWER = 139;
int RIL_UNSOL_RESPONSE_BASE = 1000;