From e6060526c0976bafc1b2a1f70435a2a75b9491df Mon Sep 17 00:00:00 2001
From: wangqi <wangqi@google.com>
Date: Thu, 5 Apr 2018 11:47:15 -0700
Subject: Fix leak of InCallActivity's DecorView and stuck on disconnection
 bug.

This is caused by not dismissing error dialog when recreating InCallActivity.
The dialog will be shown again after recreating.

Bug: 71376489,77152802
Test: manual
PiperOrigin-RevId: 191775030
Change-Id: I07ef5041979c0bbb2d44df9e41b55f0ac41e9339
---
 java/com/android/incallui/InCallActivity.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'java/com/android')

diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java
index fadc40686..0bc8e0a9a 100644
--- a/java/com/android/incallui/InCallActivity.java
+++ b/java/com/android/incallui/InCallActivity.java
@@ -563,9 +563,9 @@ public class InCallActivity extends TransactionSafeFragmentActivity
     InCallPresenter.getInstance().onActivityStopped();
     if (!isRecreating) {
       InCallPresenter.getInstance().onUiShowing(false);
-      if (errorDialog != null) {
-        errorDialog.dismiss();
-      }
+    }
+    if (errorDialog != null) {
+      errorDialog.dismiss();
     }
 
     if (isFinishing()) {
-- 
cgit v1.2.3