summaryrefslogtreecommitdiff
path: root/java/com/android
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2018-04-05 20:26:29 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-04-05 20:26:29 +0000
commite06977fa96483604321ebdee0b98664d0e00260b (patch)
tree482d578f8c6b970bf22cbe725452f6aa3ebc5c23 /java/com/android
parent51a10f66f3b86fe91ec777a14a475b85368cfb4c (diff)
parente6060526c0976bafc1b2a1f70435a2a75b9491df (diff)
Merge "Fix leak of InCallActivity's DecorView and stuck on disconnection bug."
Diffstat (limited to 'java/com/android')
-rw-r--r--java/com/android/incallui/InCallActivity.java6
1 files changed, 3 insertions, 3 deletions
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()) {