Merge "Revert "Expose sendEnvelope."" (fcca6cd0) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+4 −34

Original line number	Diff line number	Diff line
		@@ -1791,9 +1791,6 @@ public class TelephonyManager {
		*
		* Input parameters equivalent to TS 27.007 AT+CCHO command.
		*
		* <p>Requires Permission:
		* {@link android.Manifest.permission#SIM_COMMUNICATION SIM_COMMUNICATION}
		*
		* @param AID Application id. See ETSI 102.221 and 101.220.
		* @return The logical channel id which is negative on error.
		*/
		@@ -1811,9 +1808,6 @@ public class TelephonyManager {
		*
		* Input parameters equivalent to TS 27.007 AT+CCHC command.
		*
		* <p>Requires Permission:
		* {@link android.Manifest.permission#SIM_COMMUNICATION SIM_COMMUNICATION}
		*
		* @param channel is the channel id to be closed as retruned by a successful
		* iccOpenLogicalChannel.
		* @return true if the channel was closed successfully.
		@@ -1832,9 +1826,6 @@ public class TelephonyManager {
		*
		* Input parameters equivalent to TS 27.007 AT+CGLA command.
		*
		* <p>Requires Permission:
		* {@link android.Manifest.permission#SIM_COMMUNICATION SIM_COMMUNICATION}
		*
		* @param channel is the channel id to be closed as returned by a successful
		* iccOpenLogicalChannel.
		* @param cla Class of the APDU command.
		@@ -1858,27 +1849,6 @@ public class TelephonyManager {
		return "";
		}

		/**
		* 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}
		*
		* @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.
		*/
		public String sendEnvelope(String content) {
		try {
		return getITelephony().sendEnvelope(content);
		} catch (RemoteException ex) {
		} catch (NullPointerException ex) {
		}
		return "";
		}

		/**
		* Read one of the NV items defined in {@link com.android.internal.telephony.RadioNVItems}.
		* Used for device configuration by some CDMA operators.

telephony/java/com/android/internal/telephony/ITelephony.aidl

+0 −11

Original line number	Diff line number	Diff line
		@@ -372,17 +372,6 @@ interface ITelephony {
		String iccTransmitApduLogicalChannel(int channel, int cla, int instruction,
		int p1, int p2, int p3, String data);

		/**
		* 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.
		*/
		String sendEnvelope(String content);

		/**
		* Read one of the NV items defined in {@link RadioNVItems} / {@code ril_nv_items.h}.
		* Used for device configuration by some CDMA operators.