Revert "Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope.""

This reverts commit f743b163fc764b7ebf701a9e65b13d308530d750.

Change-Id: Ie274a024d2cdb6f11082e6bf391732a304863074

1 files changed, 5 insertions, 4 deletions

diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl
index 9cbf66e..8b80bfa 100644
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
@@ -373,15 +373,16 @@ interface ITelephony {
             int p1, int p2, int p3, String data);
 
     /**
-     * Send ENVELOPE to the SIM, after processing a proactive command sent by
-     * the SIM.
+     * Send ENVELOPE to the SIM and returns the response.
      *
      * @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.
+     * @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.
      */
-    String sendEnvelope(String content);
+    String sendEnvelopeWithStatus(String content);
 
     /**
      * Read one of the NV items defined in {@link RadioNVItems} / {@code ril_nv_items.h}.