summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorShishir Agrawal <shishir@google.com>2013-12-16 17:32:56 -0800
committerShishir Agrawal <shishir@google.com>2013-12-16 17:32:56 -0800
commit375890841df7aad36a042861f6a70f11e1f32766 (patch)
treee33bced29b9074eb98f5084f4500d6d58797b698 /telephony
parentc4d41755d73ffe85d179d42a4f0c993b49303145 (diff)
downloadframeworks_base-375890841df7aad36a042861f6a70f11e1f32766.zip
frameworks_base-375890841df7aad36a042861f6a70f11e1f32766.tar.gz
frameworks_base-375890841df7aad36a042861f6a70f11e1f32766.tar.bz2
Fixing build breakage due to: c4d41755d73ffe85d179d42a4f0c993b49303145
Mismatched @param in javadoc. Change-Id: I9034fac389e89e59c0245203543f52504bfc58d7
Diffstat (limited to 'telephony')
-rw-r--r--telephony/java/android/telephony/TelephonyManager.java4
-rw-r--r--telephony/java/com/android/internal/telephony/ITelephony.aidl2
2 files changed, 3 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index e0602ed..a785bac 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -1493,10 +1493,10 @@ public class TelephonyManager {
* the end. If an error occurs, an empty string is returned.
*/
public String iccTransmitApduLogicalChannel(int channel, int cla,
- int command, int p1, int p2, int p3, String data) {
+ int instruction, int p1, int p2, int p3, String data) {
try {
return getITelephony().iccTransmitApduLogicalChannel(channel, cla,
- command, p1, p2, p3, data);
+ instruction, p1, p2, p3, data);
} catch (RemoteException ex) {
} catch (NullPointerException ex) {
}
diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl
index 55da644..d9e9d56 100644
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
@@ -363,6 +363,6 @@ interface ITelephony {
* @return The APDU response from the ICC card with the status appended at
* the end. If an error occurs, an empty string is returned.
*/
- String iccTransmitApduLogicalChannel(int channel, int cla, int command,
+ String iccTransmitApduLogicalChannel(int channel, int cla, int instruction,
int p1, int p2, int p3, String data);
}