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

Commit d387ead5 authored Jun 21, 2017 by TreeHugger Robot Committed by Android (Google) Code Review Jun 21, 2017

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

parents 1ed9d2cb f5bd60e5

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 {