From c0d138ab86459883c46551130190d97f76bd7e2f Mon Sep 17 00:00:00 2001 From: Evan Charlton Date: Wed, 14 May 2014 14:01:47 -0700 Subject: Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope." This reverts commit 37384dedab38239433a41641fe87fc3e51bb6976. --- telephony/java/android/telephony/TelephonyManager.java | 11 +++++------ telephony/java/com/android/internal/telephony/ITelephony.aidl | 9 ++++----- 2 files changed, 9 insertions(+), 11 deletions(-) (limited to 'telephony') diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index cbd3ff8..3593001 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -1859,7 +1859,8 @@ public class TelephonyManager { } /** - * Send ENVELOPE to the SIM and return the response. + * Send ENVELOPE to the SIM, after processing a proactive command sent by + * the SIM. * *

Requires Permission: * {@link android.Manifest.permission#SIM_COMMUNICATION SIM_COMMUNICATION} @@ -1867,13 +1868,11 @@ public class TelephonyManager { * @param content String containing SAT/USAT response in hexadecimal * format starting with command tag. See TS 102 223 for * details. - * @return The APDU response from the ICC card, with the last 4 bytes - * being the status word. If the command fails, returns an empty - * string. + * @return The APDU response from the ICC card. */ - public String sendEnvelopeWithStatus(String content) { + public String sendEnvelope(String content) { try { - return getITelephony().sendEnvelopeWithStatus(content); + return getITelephony().sendEnvelope(content); } catch (RemoteException ex) { } catch (NullPointerException ex) { } diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index ab2a9b8..4341e0e 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -373,16 +373,15 @@ interface ITelephony { int p1, int p2, int p3, String data); /** - * Send ENVELOPE to the SIM and returns the response. + * Send ENVELOPE to the SIM, after processing a proactive command sent by + * the SIM. * * @param contents String containing SAT/USAT response in hexadecimal * format starting with command tag. See TS 102 223 for * details. - * @return The APDU response from the ICC card, with the last 4 bytes - * being the status word. If the command fails, returns an empty - * string. + * @return The APDU response from the ICC card. */ - String sendEnvelopeWithStatus(String content); + String sendEnvelope(String content); /** * Read one of the NV items defined in {@link RadioNVItems} / {@code ril_nv_items.h}. -- cgit v1.1