summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwangqi <wangqi@google.com>2018-04-05 13:47:18 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-04-05 13:47:18 -0700
commitc0e00d3a7b6d24d1cecaf778e124a35f7b2145e7 (patch)
tree934cd54dc5571edd55381470c9bc273136644bef
parent3ed49c1f4ae47a066a533f34332d73a57bf878e5 (diff)
parentabe53861a2c3b59f80cdaab531784c89229a2193 (diff)
Merge "Fix leak of InCallActivity's DecorView and stuck on disconnection bug." am: e06977fa96
am: abe53861a2 Change-Id: I9e2b5cb8729f01f2e19e54c70a8f8bd357484be9
-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()) {