InCallUI: Dismiss reject sms dialogs when press back key on DSDA mode

On DSDA mode, when the user press back key, it does not dismiss reject sms
dialogs, mCannedResponsePopup and mCustomMessagePopup are not set to null.
Then hasPendingDialogs() will return false, so the user can not finish
InCallUI with back key when the incoming call is hung up.

Dismiss reject sms dialogs and set the dialog to null once the dialog is
cancelled by the user.

CRs-Fixed: 654387

Change-Id: Ic45a0906b38383a9a919df82b00e4f2010fac1cb

1 files changed, 9 insertions, 0 deletions

diff --git a/src/com/android/incallui/MSimAnswerFragment.java b/src/com/android/incallui/MSimAnswerFragment.java
index 92ff5c2c..7621f907 100644
--- a/src/com/android/incallui/MSimAnswerFragment.java
+++ b/src/com/android/incallui/MSimAnswerFragment.java
@@ -155,6 +155,8 @@ public class MSimAnswerFragment extends BaseFragment<MSimAnswerPresenter,
                 if (mGlowpad != null) {
                     mGlowpad.startPing();
                 }
+                dismissCannedResponsePopup();
+                getPresenter().onDismissDialog();
             }
         });
         mCannedResponsePopup = builder.create();
@@ -239,6 +241,13 @@ public class MSimAnswerFragment extends BaseFragment<MSimAnswerPresenter,
                         getPresenter().onDismissDialog();
                     }
                 })
+                .setOnCancelListener(new DialogInterface.OnCancelListener() {
+                    @Override
+                    public void onCancel(DialogInterface dialogInterface) {
+                        dismissCustomMessagePopup();
+                        getPresenter().onDismissDialog();
+                    }
+                })
                 .setTitle(R.string.respond_via_sms_custom_message);
         mCustomMessagePopup = builder.create();