Merge "Fix public issue #18054: USSD in-call toast"
am: 7b12c33114
Change-Id: Ia976fe29d54e4c8c9af1853f9c09a117f64747db
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f89ed64..f5db225 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -999,8 +999,6 @@
<string name="incall_error_call_failed">Call failed.</string>
<!-- In-call screen: call failure message displayed in an error dialog -->
<string name="incall_error_cannot_add_call">Call cannot be added at this time.</string>
- <!-- In-call screen: status message displayed in a dialog when starting an MMI -->
- <string name="incall_status_dialed_mmi">Starting MMI sequence\u2026</string>
<!-- In-call screen: message displayed in an error dialog -->
<string name="incall_error_supp_service_unknown">Service not supported</string>
<!-- In-call screen: message displayed in an error dialog -->
diff --git a/src/com/android/phone/MMIDialogActivity.java b/src/com/android/phone/MMIDialogActivity.java
index 10ec6a3..5ac6b85 100644
--- a/src/com/android/phone/MMIDialogActivity.java
+++ b/src/com/android/phone/MMIDialogActivity.java
@@ -63,9 +63,6 @@
}
};
mCM.registerForMmiComplete(mHandler, PhoneGlobals.MMI_COMPLETE, null);
- if (mCM.getState() == PhoneConstants.State.OFFHOOK) {
- Toast.makeText(this, R.string.incall_status_dialed_mmi, Toast.LENGTH_SHORT).show();
- }
showMMIDialog();
}