commit 75ce5b65468e421a80d2cf4a66c50063445dc3a4
author Anthony Lee <anthonylee@google.com> Wed Nov 12 19:56:55 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 12 19:56:55 2014 +0000
tree a38459c75f592a66f92a182c93b7f5945897b40c
parent b5f9efb7c7356b98d06f2dc8b486be0703c5fbe6
parent 2333fc1b0666a9102bd8dc63eb6e073dcb98a1f9

Merge "Handle exceptions other than CommandException" into lmp-mr1-dev

src/com/android/phone/CallWaitingCheckBoxPreference.java

diff --git a/src/com/android/phone/CallWaitingCheckBoxPreference.java b/src/com/android/phone/CallWaitingCheckBoxPreference.java
index ce2a420..bda8b3b 100644
--- a/src/com/android/phone/CallWaitingCheckBoxPreference.java
+++ b/src/com/android/phone/CallWaitingCheckBoxPreference.java
@@ -87,15 +87,20 @@
                 }
             }
 
-            if (ar.exception != null) {
+            if (ar.exception instanceof CommandException) {
                 if (DBG) {
-                    Log.d(LOG_TAG, "handleGetCallWaitingResponse: ar.exception=" + ar.exception);
+                    Log.d(LOG_TAG, "handleGetCallWaitingResponse: CommandException=" +
+                            ar.exception);
                 }
                 if (mTcpListener != null) {
                     mTcpListener.onException(CallWaitingCheckBoxPreference.this,
                             (CommandException)ar.exception);
                 }
-            } else if (ar.userObj instanceof Throwable) {
+            } else if (ar.userObj instanceof Throwable || ar.exception != null) {
+                // Still an error case but just not a CommandException.
+                if (DBG) {
+                    Log.d(LOG_TAG, "handleGetCallWaitingResponse: Exception" + ar.exception);
+                }
                 if (mTcpListener != null) {
                     mTcpListener.onError(CallWaitingCheckBoxPreference.this, RESPONSE_ERROR);
                 }