Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57c62c94 authored by Jang Hayeong's avatar Jang Hayeong Committed by Chinmay Dhodapkar
Browse files

MMI code: Fix response state 



onQueryComplete doesn't give proper response state.
Regarding response result, allowed result should
have COMPLETE state.
Exception and wrong result should have FAIL state.

Bug: 146531982

Change-Id: I772bd907554e1a43ce78a4a658b9ccf1e5711d67
Signed-off-by: default avatarJang Hayeong <hayeong.jang@samsung.com>
parent c56a7070

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

+4 −3
Original line number Diff line number Diff line
@@ -1678,9 +1678,8 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode { 
        StringBuilder sb = new StringBuilder(getScString());

        sb.append("\n");



        if (ar.exception != null) {

        mState = State.FAILED;



        if (ar.exception != null) {

            if (ar.exception instanceof ImsException) {

                sb.append(getImsErrorMessage(ar));

            } else {
@@ -1693,19 +1692,21 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode { 
            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;