Merge "Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope."" (605e4942) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -27083,7 +27083,7 @@ package android.telephony {
		method public boolean isNetworkRoaming();
		method public void listen(android.telephony.PhoneStateListener, int);
		method public void newIncomingThirdPartyCall(android.content.ComponentName, java.lang.String, java.lang.String);
		method public java.lang.String sendEnvelopeWithStatus(java.lang.String);
		method public java.lang.String sendEnvelope(java.lang.String);
		field public static final java.lang.String ACTION_PHONE_STATE_CHANGED = "android.intent.action.PHONE_STATE";
		field public static final java.lang.String ACTION_RESPOND_VIA_MESSAGE = "android.intent.action.RESPOND_VIA_MESSAGE";
		field public static final int CALL_STATE_IDLE = 0; // 0x0

+5 −6

Original line number	Diff line number	Diff line
		@@ -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) {
		}

+4 −5

Original line number	Diff line number	Diff line
		@@ -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}.