am 0ec424c1: Merge "Add public qualifier to TelephonyManager.TeleiccExchangeSimIO." into lmp-dev

* commit '0ec424c13d07bc59632bc85985ab0b5fd8ae0dec':
  Add public qualifier to TelephonyManager.TeleiccExchangeSimIO.
This commit is contained in:
Shishir Agrawal
2014-08-19 19:16:45 +00:00
committed by Android Git Automerger
2 changed files with 2 additions and 1 deletions

View File

@@ -29640,6 +29640,7 @@ package android.telephony {
method public int hasCarrierPrivileges();
method public boolean hasIccCard();
method public boolean iccCloseLogicalChannel(int);
method public byte[] iccExchangeSimIO(int, int, int, int, int, java.lang.String);
method public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(java.lang.String);
method public java.lang.String iccTransmitApduBasicChannel(int, int, int, int, int, java.lang.String);
method public java.lang.String iccTransmitApduLogicalChannel(int, int, int, int, int, int, java.lang.String);

View File

@@ -2459,7 +2459,7 @@ public class TelephonyManager {
* @param filePath
* @return The APDU response.
*/
byte[] iccExchangeSimIO(int fileID, int command, int p1, int p2, int p3,
public byte[] iccExchangeSimIO(int fileID, int command, int p1, int p2, int p3,
String filePath) {
try {
return getITelephony().iccExchangeSimIO(fileID, command, p1, p2,