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

Commit 1a18fef8 authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Ensure empty string MMI responses default to "MMI Complete"." into oc-dev 

am: d387ead5

Change-Id: Iba5af87cd2e89ec8ddb97d064d55bc44a40aba9f
parents 0d20f106 d387ead5

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 {