summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwangqi <wangqi@google.com>2018-04-05 13:40:35 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-04-05 13:40:35 -0700
commitabe53861a2c3b59f80cdaab531784c89229a2193 (patch)
tree482d578f8c6b970bf22cbe725452f6aa3ebc5c23
parent15377a9c79c5870a0745aa456155cbe434d9665a (diff)
parente06977fa96483604321ebdee0b98664d0e00260b (diff)
Merge "Fix leak of InCallActivity's DecorView and stuck on disconnection bug."
am: e06977fa96 Change-Id: I2803e6c2570f22d56e207ce9730bedaa0b10a301
-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()) {