commit 6bed64106da8b18e7522176a7c9aefa30214bc5d
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jan 11 02:25:24 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jan 11 02:25:24 2020 +0000
tree 998140e359d334296b5ff857acbc28ac28d74e0d
parent 79938778c10c73c88a7da0b7e03424061ae76406
parent 6966467100f1e05d8d7e9bf521262831659692da

Merge "MMI code: Fix response state" am: 973706d124 am: fc82e64e58 am: 6966467100

Change-Id: I8fdad3951226ec06a87403ebd1fe4a4d84c5e98d

src/java/com/android/internal/telephony/imsphone/ImsPhoneMmiCode.java

diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhoneMmiCode.java b/src/java/com/android/internal/telephony/imsphone/ImsPhoneMmiCode.java
index 527b180..b9d5606 100644
--- a/src/java/com/android/internal/telephony/imsphone/ImsPhoneMmiCode.java
+++ b/src/java/com/android/internal/telephony/imsphone/ImsPhoneMmiCode.java
@@ -1678,9 +1678,8 @@
         StringBuilder sb = new StringBuilder(getScString());
         sb.append("\n");
 
+        mState = State.FAILED;
         if (ar.exception != null) {
-            mState = State.FAILED;
-
             if (ar.exception instanceof ImsException) {
                 sb.append(getImsErrorMessage(ar));
             } else {
@@ -1693,19 +1692,21 @@
             if (ints.length != 0) {
                 if (ints[0] == 0) {
                     sb.append(mContext.getText(com.android.internal.R.string.serviceDisabled));
+                    mState = State.COMPLETE;
                 } else if (mSc.equals(SC_WAIT)) {
                     // Call Waiting includes additional data in the response.
                     sb.append(createQueryCallWaitingResultMessage(ints[1]));
+                    mState = State.COMPLETE;
                 } else if (ints[0] == 1) {
                     // for all other services, treat it as a boolean
                     sb.append(mContext.getText(com.android.internal.R.string.serviceEnabled));
+                    mState = State.COMPLETE;
                 } else {
                     sb.append(mContext.getText(com.android.internal.R.string.mmiError));
                 }
             } else {
                 sb.append(mContext.getText(com.android.internal.R.string.mmiError));
             }
-            mState = State.COMPLETE;
         }
 
         mMessage = sb;