diff options
| author | Shishir Agrawal <shishir@google.com> | 2014-08-19 19:11:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-19 02:43:23 +0000 |
| commit | a34bdb18c564b8a28996d7dc85edd7dd1ffb5c7c (patch) | |
| tree | b4277f18f68593ce7175751d02d7c195f3bea143 | |
| parent | 3a6eba01c48363f675090bd8e0f853a7fbf2165d (diff) | |
| parent | 64820af4e56cd5d6a6afcfde93d94427257a7677 (diff) | |
| download | frameworks_base-a34bdb18c564b8a28996d7dc85edd7dd1ffb5c7c.zip frameworks_base-a34bdb18c564b8a28996d7dc85edd7dd1ffb5c7c.tar.gz frameworks_base-a34bdb18c564b8a28996d7dc85edd7dd1ffb5c7c.tar.bz2 | |
Merge "Add public qualifier to TelephonyManager.TeleiccExchangeSimIO." into lmp-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index fd7c053..b8a65fc 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index c50110a..d4f8362 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -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, |