diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-06-21 19:55:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-06-21 19:55:47 +0000 |
| commit | d387ead53d190d76eff3935e7eed0987fe7dfc31 (patch) | |
| tree | 6be2fa66f48a9fd41c16cd34fc1b9414d597e372 /src/java/com/android | |
| parent | 1ed9d2cb208a6cbb669ad630b383539daf55f9d6 (diff) | |
| parent | f5bd60e5d8cb7700aced832ee685da8a77044a22 (diff) | |
| download | android_frameworks_opt_telephony-d387ead53d190d76eff3935e7eed0987fe7dfc31.tar.gz android_frameworks_opt_telephony-d387ead53d190d76eff3935e7eed0987fe7dfc31.tar.bz2 android_frameworks_opt_telephony-d387ead53d190d76eff3935e7eed0987fe7dfc31.zip | |
Merge "Ensure empty string MMI responses default to "MMI Complete"." into oc-dev
Diffstat (limited to 'src/java/com/android')
| -rw-r--r-- | src/java/com/android/internal/telephony/gsm/GsmMmiCode.java | 3 | ||||
| -rw-r--r-- | src/java/com/android/internal/telephony/imsphone/ImsPhoneMmiCode.java | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/java/com/android/internal/telephony/gsm/GsmMmiCode.java b/src/java/com/android/internal/telephony/gsm/GsmMmiCode.java index a1f304cc7..ad325ea47 100644 --- a/src/java/com/android/internal/telephony/gsm/GsmMmiCode.java +++ b/src/java/com/android/internal/telephony/gsm/GsmMmiCode.java @@ -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; diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhoneMmiCode.java b/src/java/com/android/internal/telephony/imsphone/ImsPhoneMmiCode.java index 104b6b0e4..b1013b1f3 100644 --- a/src/java/com/android/internal/telephony/imsphone/ImsPhoneMmiCode.java +++ b/src/java/com/android/internal/telephony/imsphone/ImsPhoneMmiCode.java @@ -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 { |