diff options
author | Derek Tan <derektan@google.com> | 2014-09-05 23:53:09 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-05 23:53:10 +0000 |
commit | a0729d348764424b795cafc9ab175349009e5295 (patch) | |
tree | 3fcf98c2852b2130d97f52572daf1a40eb6bb45d /telephony | |
parent | 1244333998c5be80b5abe34bbf38922cb4366b57 (diff) | |
parent | 1eda68766be31fdf4a0c038ed6a459b3df0311fe (diff) | |
download | frameworks_base-a0729d348764424b795cafc9ab175349009e5295.zip frameworks_base-a0729d348764424b795cafc9ab175349009e5295.tar.gz frameworks_base-a0729d348764424b795cafc9ab175349009e5295.tar.bz2 |
Merge "Update the comment in sendEnvelope." into lmp-dev
Diffstat (limited to 'telephony')
-rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 0078ea8..6c35058 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -2511,9 +2511,9 @@ public class TelephonyManager { * @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, with the last 4 bytes - * being the status word. If the command fails, returns an empty - * string. + * @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. */ public String sendEnvelopeWithStatus(String content) { try { |