InCallUI not dismissing after end call is clicked.

In MT InCallScreen, the customMessage dialog
which appears when user tries to reject a call
with message, is not set to null when user
cancels the dialog.
InCallUIActvity is not finished if there is any
pending dialog which is not null and hence this
issue is seen.

Set the dialog variable to null once the dialog
is cancelled by the user.

Bug: 22254547

Change-Id: I86d314461c760387cb5f8099a01da9afe4a79085

1 files changed, 7 insertions, 0 deletions

diff --git a/InCallUI/src/com/android/incallui/AnswerFragment.java b/InCallUI/src/com/android/incallui/AnswerFragment.java
index 50428d650..7c67719b0 100644
--- a/InCallUI/src/com/android/incallui/AnswerFragment.java
+++ b/InCallUI/src/com/android/incallui/AnswerFragment.java
@@ -297,6 +297,13 @@ public class AnswerFragment extends BaseFragment<AnswerPresenter, AnswerPresente
                         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();