Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 37384dedab.
This commit is contained in:
Evan Charlton
2014-05-14 14:01:47 -07:00
parent f8c940733e
commit c0d138ab86
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -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.
*
* <p>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) {
}

9
telephony/java/com/android/internal/telephony/ITelephony.aidl
View File

@@ -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}.