commit e06977fa96483604321ebdee0b98664d0e00260b
author Treehugger Robot <treehugger-gerrit@google.com> Thu Apr 05 20:26:29 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 05 20:26:29 2018 +0000
tree 482d578f8c6b970bf22cbe725452f6aa3ebc5c23
parent 51a10f66f3b86fe91ec777a14a475b85368cfb4c
parent e6060526c0976bafc1b2a1f70435a2a75b9491df

Merge "Fix leak of InCallActivity's DecorView and stuck on disconnection bug."

java/com/android/incallui/InCallActivity.java

diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java
index fadc406..0bc8e0a 100644
--- a/java/com/android/incallui/InCallActivity.java
+++ b/java/com/android/incallui/InCallActivity.java
@@ -563,9 +563,9 @@
     InCallPresenter.getInstance().onActivityStopped();
     if (!isRecreating) {
       InCallPresenter.getInstance().onUiShowing(false);
-      if (errorDialog != null) {
-        errorDialog.dismiss();
-      }
+    }
+    if (errorDialog != null) {
+      errorDialog.dismiss();
     }
 
     if (isFinishing()) {