commit a754ba14f729744f3261113d5e355b86d5c846d3
author Junda Liu <junda@google.com> Wed May 20 01:17:52 2015 -0700
committer Junda Liu <junda@google.com> Wed May 20 01:17:54 2015 -0700
tree d96b93b37d9e8d5a21881b214a61e337021450ba
parent 9f2d271f693b445e513235ebc48ccd0f67926860

Compare Error enum, not string, to get open channel error.

Bug: b/21313437

Change-Id: I682a0e4e0cf16057c0674b1845fe1d80984fc029

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index e4b8c35..bde8e02 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -464,10 +464,12 @@
                         }
 
                         int errorCode = IccOpenLogicalChannelResponse.STATUS_UNKNOWN_ERROR;
-                        if ((ar.exception != null) && (ar.exception instanceof CommandException)) {
-                            if (ar.exception.getMessage().compareTo("MISSING_RESOURCE") == 0) {
+                        if (ar.exception instanceof CommandException) {
+                            CommandException.Error error =
+                                ((CommandException) (ar.exception)).getCommandError();
+                            if (error == CommandException.Error.MISSING_RESOURCE) {
                                 errorCode = IccOpenLogicalChannelResponse.STATUS_MISSING_RESOURCE;
-                            } else if (ar.exception.getMessage().compareTo("NO_SUCH_ELEMENT") == 0) {
+                            } else if (error == CommandException.Error.NO_SUCH_ELEMENT) {
                                 errorCode = IccOpenLogicalChannelResponse.STATUS_NO_SUCH_ELEMENT;
                             }
                         }