commit 86274fc46a0f8c4d0f7996aaf80c42774c8f30e1
author Chaitanya Saggurthi <csaggurt@qti.qualcomm.com> Tue Jul 28 20:32:00 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 28 20:32:00 2015 +0000
tree 595625371c496a470184e6893b40f1c31ab27be0
parent b0e1b80981ef84062aec48ce2362b727b5149769
parent 798ad89761c04e7a3b3df5bb05c313193f38daa2

am 2612082f: am 4d0d81f7: am 46890059: am e87e4a8a: am f8f94b2f: InCallUI not dismissing after end call is clicked.

* commit '2612082f39eba171634fb1039ccc6a0569bc3037':
  InCallUI not dismissing after end call is clicked.

InCallUI/src/com/android/incallui/AnswerFragment.java

diff --git a/InCallUI/src/com/android/incallui/AnswerFragment.java b/InCallUI/src/com/android/incallui/AnswerFragment.java
index 50428d6..7c67719 100644
--- a/InCallUI/src/com/android/incallui/AnswerFragment.java
+++ b/InCallUI/src/com/android/incallui/AnswerFragment.java
@@ -297,6 +297,13 @@
                         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();