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

Commit f5bd60e5 authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Ensure empty string MMI responses default to "MMI Complete". 

The existing code checks for null only, but it looks like the modem or
network can sometimes return empty string when there is not result,
which would cause no "MMI Complete" dialog to show.
Checking for empty string as well will solve this problem.

Test: Regression tested MMI codes.
Bug: 37561464
Change-Id: I09caec7eae944bd3dfe97ac8f89c8a113800de1e
parent 041b6e81

src/java/com/android/internal/telephony/gsm/GsmMmiCode.java

+2 −1
Original line number Diff line number Diff line
@@ -1017,7 +1017,8 @@ public final class GsmMmiCode extends Handler implements MmiCode { 
    public void

    onUssdFinished(String ussdMessage, boolean isUssdRequest) {

        if (mState == State.PENDING) {

            if (ussdMessage == null) {

            if (TextUtils.isEmpty(ussdMessage)) {

                Rlog.d(LOG_TAG, "onUssdFinished: no network provided message; using default.");

                mMessage = mContext.getText(com.android.internal.R.string.mmiComplete);

            } else {

                mMessage = ussdMessage;

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

+1 −1
Original line number Diff line number Diff line
@@ -998,7 +998,7 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode { 
    void

    onUssdFinished(String ussdMessage, boolean isUssdRequest) {

        if (mState == State.PENDING) {

            if (ussdMessage == null) {

            if (TextUtils.isEmpty(ussdMessage)) {

                mMessage = mContext.getText(com.android.internal.R.string.mmiComplete);

                Rlog.v(LOG_TAG, "onUssdFinished: no message; using: " + mMessage);

            } else {