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

Merge "Update javadoc of deprecated UICC APIs"

Browse Source
This commit is contained in:
Rambo Wang
2020-02-19 17:10:20 +00:00
committed by Gerrit Code Review
parent 0e9166f15b e85e8e7cd3
commit e73b46c9d9
1 changed files with 55 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6040,9 +6040,11 @@ public class TelephonyManager {
* @param AID Application id. See ETSI 102.221 and 101.220.
* @param p2 P2 parameter (described in ISO 7816-4).
* @return an IccOpenLogicalChannelResponse object.
* @deprecated Use {@link android.se.omapi.SEService} APIs instead.
* @deprecated Use {@link android.se.omapi.SEService} APIs instead. See
* {@link android.se.omapi.SEService#getUiccReader(int)},
* {@link android.se.omapi.Reader#openSession()},
* {@link android.se.omapi.Session#openLogicalChannel(byte[], byte)}.
*/
// TODO(b/147153909): Update Javadoc to link to specific SEService API once integrated.
@Deprecated
public IccOpenLogicalChannelResponse iccOpenLogicalChannel(String AID, int p2) {
return iccOpenLogicalChannel(getSubId(), AID, p2);
@@ -6074,9 +6076,11 @@ public class TelephonyManager {
* @param p2 P2 parameter (described in ISO 7816-4).
* @return an IccOpenLogicalChannelResponse object.
* @hide
* @deprecated Use {@link android.se.omapi.SEService} APIs instead.
* @deprecated Use {@link android.se.omapi.SEService} APIs instead. See
* {@link android.se.omapi.SEService#getUiccReader(int)},
* {@link android.se.omapi.Reader#openSession()},
* {@link android.se.omapi.Session#openLogicalChannel(byte[], byte)}.
*/
// TODO(b/147153909): Update Javadoc to link to specific SEService API once integrated.
@Deprecated
public IccOpenLogicalChannelResponse iccOpenLogicalChannel(int subId, String AID, int p2) {
try {
@@ -6105,9 +6109,9 @@ public class TelephonyManager {
* iccOpenLogicalChannel.
* @return true if the channel was closed successfully.
* @hide
* @deprecated Use {@link android.se.omapi.SEService} APIs instead.
* @deprecated Use {@link android.se.omapi.SEService} APIs instead. See
* {@link android.se.omapi.Channel#close()}.
*/
// TODO(b/147153909): Update Javadoc to link to specific SEService API once integrated.
@Deprecated
@RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)
@SystemApi
@@ -6135,9 +6139,9 @@ public class TelephonyManager {
* @param channel is the channel id to be closed as returned by a successful
* iccOpenLogicalChannel.
* @return true if the channel was closed successfully.
* @deprecated Use {@link android.se.omapi.SEService} APIs instead.
* @deprecated Use {@link android.se.omapi.SEService} APIs instead. See
* {@link android.se.omapi.Channel#close()}.
*/
// TODO(b/147153909): Update Javadoc to link to specific SEService API once integrated.
@Deprecated
public boolean iccCloseLogicalChannel(int channel) {
return iccCloseLogicalChannel(getSubId(), channel);
@@ -6157,9 +6161,9 @@ public class TelephonyManager {
* iccOpenLogicalChannel.
* @return true if the channel was closed successfully.
* @hide
* @deprecated Use {@link android.se.omapi.SEService} APIs instead.
* @deprecated Use {@link android.se.omapi.SEService} APIs instead. See
* {@link android.se.omapi.Channel#close()}.
*/
// TODO(b/147153909): Update Javadoc to link to specific SEService API once integrated.
@Deprecated
public boolean iccCloseLogicalChannel(int subId, int channel) {
try {
@@ -6196,9 +6200,9 @@ public class TelephonyManager {
* @return The APDU response from the ICC card with the status appended at the end, or null if
* there is an issue connecting to the Telephony service.
* @hide
* @deprecated Use {@link android.se.omapi.SEService} APIs instead.
* @deprecated Use {@link android.se.omapi.SEService} APIs instead. See
* {@link android.se.omapi.Channel#transmit(byte[])}.
*/
// TODO(b/147153909): Update Javadoc to link to specific SEService API once integrated.
@Deprecated
@RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)
@SystemApi
@@ -6237,9 +6241,9 @@ public class TelephonyManager {
* @param data Data to be sent with the APDU.
* @return The APDU response from the ICC card with the status appended at
* the end.
* @deprecated Use {@link android.se.omapi.SEService} APIs instead.
* @deprecated Use {@link android.se.omapi.SEService} APIs instead. See
* {@link android.se.omapi.Channel#transmit(byte[])}.
*/
// TODO(b/147153909): Update Javadoc to link to specific SEService API once integrated.
@Deprecated
public String iccTransmitApduLogicalChannel(int channel, int cla,
int instruction, int p1, int p2, int p3, String data) {
@@ -6269,9 +6273,9 @@ public class TelephonyManager {
* @return The APDU response from the ICC card with the status appended at
* the end.
* @hide
* @deprecated Use {@link android.se.omapi.SEService} APIs instead.
* @deprecated Use {@link android.se.omapi.SEService} APIs instead. See
* {@link android.se.omapi.Channel#transmit(byte[])}.
*/
// TODO(b/147153909): Update Javadoc to link to specific SEService API once integrated.
@Deprecated
public String iccTransmitApduLogicalChannel(int subId, int channel, int cla,
int instruction, int p1, int p2, int p3, String data) {
@@ -6308,9 +6312,12 @@ public class TelephonyManager {
* @return The APDU response from the ICC card with the status appended at
* the end.
* @hide
* @deprecated Use {@link android.se.omapi.SEService} APIs instead.
* @deprecated Use {@link android.se.omapi.SEService} APIs instead. See
* {@link android.se.omapi.SEService#getUiccReader(int)},
* {@link android.se.omapi.Reader#openSession()},
* {@link android.se.omapi.Session#openBasicChannel(byte[], byte)},
* {@link android.se.omapi.Channel#transmit(byte[])}.
*/
// TODO(b/147153909): Update Javadoc to link to specific SEService API once integrated.
@Deprecated
@RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)
@SystemApi
@@ -6347,9 +6354,12 @@ public class TelephonyManager {
* @param data Data to be sent with the APDU.
* @return The APDU response from the ICC card with the status appended at
* the end.
* @deprecated Use {@link android.se.omapi.SEService} APIs instead.
* @deprecated Use {@link android.se.omapi.SEService} APIs instead. See
* {@link android.se.omapi.SEService#getUiccReader(int)},
* {@link android.se.omapi.Reader#openSession()},
* {@link android.se.omapi.Session#openBasicChannel(byte[], byte)},
* {@link android.se.omapi.Channel#transmit(byte[])}.
*/
// TODO(b/147153909): Update Javadoc to link to specific SEService API once integrated.
@Deprecated
public String iccTransmitApduBasicChannel(int cla,
int instruction, int p1, int p2, int p3, String data) {
@@ -6377,9 +6387,12 @@ public class TelephonyManager {
* @return The APDU response from the ICC card with the status appended at
* the end.
* @hide
* @deprecated Use {@link android.se.omapi.SEService} APIs instead.
* @deprecated Use {@link android.se.omapi.SEService} APIs instead. See
* {@link android.se.omapi.SEService#getUiccReader(int)},
* {@link android.se.omapi.Reader#openSession()},
* {@link android.se.omapi.Session#openBasicChannel(byte[], byte)},
* {@link android.se.omapi.Channel#transmit(byte[])}.
*/
// TODO(b/147153909): Update Javadoc to link to specific SEService API once integrated.
@Deprecated
public String iccTransmitApduBasicChannel(int subId, int cla,
int instruction, int p1, int p2, int p3, String data) {
@@ -6408,9 +6421,12 @@ public class TelephonyManager {
* @param p3 P3 value of the APDU command.
* @param filePath
* @return The APDU response.
* @deprecated Use {@link android.se.omapi.SEService} APIs instead.
* @deprecated Use {@link android.se.omapi.SEService} APIs instead. See
* {@link android.se.omapi.SEService#getUiccReader(int)},
* {@link android.se.omapi.Reader#openSession()},
* {@link android.se.omapi.Session#openBasicChannel(byte[], byte)},
* {@link android.se.omapi.Channel#transmit(byte[])}.
*/
// TODO(b/147153909): Update Javadoc to link to specific SEService API once integrated.
@Deprecated
public byte[] iccExchangeSimIO(int fileID, int command, int p1, int p2, int p3,
String filePath) {
@@ -6433,9 +6449,12 @@ public class TelephonyManager {
* @param filePath
* @return The APDU response.
* @hide
* @deprecated Use {@link android.se.omapi.SEService} APIs instead.
* @deprecated Use {@link android.se.omapi.SEService} APIs instead. See
* {@link android.se.omapi.SEService#getUiccReader(int)},
* {@link android.se.omapi.Reader#openSession()},
* {@link android.se.omapi.Session#openBasicChannel(byte[], byte)},
* {@link android.se.omapi.Channel#transmit(byte[])}.
*/
// TODO(b/147153909): Update Javadoc to link to specific SEService API once integrated.
@Deprecated
public byte[] iccExchangeSimIO(int subId, int fileID, int command, int p1, int p2,
int p3, String filePath) {
@@ -6462,9 +6481,12 @@ public class TelephonyManager {
* @return The APDU response from the ICC card in hexadecimal format
* with the last 4 bytes being the status word. If the command fails,
* returns an empty string.
* @deprecated Use {@link android.se.omapi.SEService} APIs instead.
* @deprecated Use {@link android.se.omapi.SEService} APIs instead. See
* {@link android.se.omapi.SEService#getUiccReader(int)},
* {@link android.se.omapi.Reader#openSession()},
* {@link android.se.omapi.Session#openBasicChannel(byte[], byte)},
* {@link android.se.omapi.Channel#transmit(byte[])}.
*/
// TODO(b/147153909): Update Javadoc to link to specific SEService API once integrated.
@Deprecated
public String sendEnvelopeWithStatus(String content) {
return sendEnvelopeWithStatus(getSubId(), content);
@@ -6485,9 +6507,12 @@ public class TelephonyManager {
* with the last 4 bytes being the status word. If the command fails,
* returns an empty string.
* @hide
* @deprecated Use {@link android.se.omapi.SEService} APIs instead.
* @deprecated Use {@link android.se.omapi.SEService} APIs instead. See
* {@link android.se.omapi.SEService#getUiccReader(int)},
* {@link android.se.omapi.Reader#openSession()},
* {@link android.se.omapi.Session#openBasicChannel(byte[], byte)},
* {@link android.se.omapi.Channel#transmit(byte[])}.
*/
// TODO(b/147153909): Update Javadoc to link to specific SEService API once integrated.
@Deprecated
public String sendEnvelopeWithStatus(int subId, String content) {
try {