commit 0f6846dba87868a5bd020bfaeffc3f37e1441af3
author Tyler Gunn <tgunn@google.com> Wed Aug 09 22:25:35 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 09 22:25:35 2017 +0000
tree 57a1d134aeb38fef91eaccb695936aa0a0e12ac4
parent ad7e89a3f2b9da0f5985d2223ccc428e25bb86f1
parent 4ca01507a648b10f0692a87dcd741c64266ddee2

Merge "Ensure MMIDialogActivity can respond to IMS MMI codes."

src/com/android/phone/MMIDialogActivity.java

diff --git a/src/com/android/phone/MMIDialogActivity.java b/src/com/android/phone/MMIDialogActivity.java
index 1e6fa41..00a543a 100644
--- a/src/com/android/phone/MMIDialogActivity.java
+++ b/src/com/android/phone/MMIDialogActivity.java
@@ -32,6 +32,7 @@
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneConstants;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -87,7 +88,11 @@
     }
 
     private void showMMIDialog() {
-        final List<? extends MmiCode> codes = mPhone.getPendingMmiCodes();
+        final List<MmiCode> codes = new ArrayList<>(mPhone.getPendingMmiCodes());
+        // If the phone has an IMS phone, also get pending imS MMIsl.
+        if (mPhone.getImsPhone() != null) {
+            codes.addAll(mPhone.getImsPhone().getPendingMmiCodes());
+        }
         if (codes.size() > 0) {
             final MmiCode mmiCode = codes.get(0);
             final Message message = Message.obtain(mHandler, PhoneGlobals.MMI_CANCEL);