commit 5ec14172e42d180d7dd6110ef8eb1dedb0a0a7fb
author Shishir Agrawal <shishir@google.com> Tue Aug 05 17:05:45 2014 -0700
committer Shishir Agrawal <shishir@google.com> Tue Aug 05 17:05:45 2014 -0700
tree 77f8694b51f1204ed16f5183dc6be9c26d279fd6
parent f16de200ad667aab71cc8103921c9e5aaf882f04

Return APDU status code on tramsit channel command failure.

Change-Id: Ib4a3ea5e6d87db27533fc31e710ef31fd2a7c49e

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 16e39e5..b392815 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1607,16 +1607,12 @@
                 new IccAPDUArgument(channel, cla, command, p1, p2, p3, data));
         if (DBG) log("iccTransmitApduLogicalChannel: " + response);
 
-        // If the payload is null, there was an error. Indicate that by returning
-        // an empty string.
-        if (response.payload == null) {
-          return "";
-        }
-
         // Append the returned status code to the end of the response payload.
         String s = Integer.toHexString(
                 (response.sw1 << 8) + response.sw2 + 0x10000).substring(1);
-        s = IccUtils.bytesToHexString(response.payload) + s;
+        if (response.payload != null) {
+            s = IccUtils.bytesToHexString(response.payload) + s;
+        }
         return s;
     }
 
@@ -1634,16 +1630,12 @@
                 new IccAPDUArgument(0, cla, command, p1, p2, p3, data));
         if (DBG) log("iccTransmitApduBasicChannel: " + response);
 
-        // If the payload is null, there was an error. Indicate that by returning
-        // an empty string.
-        if (response.payload == null) {
-          return "";
-        }
-
         // Append the returned status code to the end of the response payload.
         String s = Integer.toHexString(
                 (response.sw1 << 8) + response.sw2 + 0x10000).substring(1);
-        s = IccUtils.bytesToHexString(response.payload) + s;
+        if (response.payload != null) {
+            s = IccUtils.bytesToHexString(response.payload) + s;
+        }
         return s;
     }