From 3b2c7814d05cef19a7e4797d5a756621cc0eeb77 Mon Sep 17 00:00:00 2001
From: twyen <twyen@google.com>
Date: Mon, 30 Apr 2018 12:13:06 -0700
Subject: Don't show dialog if in call activity is not visible.

UiListener nulls out the callbacks onDetach(), which is after onSaveInstanceState().

TEST=N/A InCallActivity is not testable.
Bug: 78517857
Test: N/A InCallActivity is not testable.
PiperOrigin-RevId: 194824783
Change-Id: I2c4f41cf58a498a841f69ef078e58d07ec5b3c5a
---
 java/com/android/incallui/InCallActivity.java | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'java/com/android')

diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java
index 0f0e9d9f2..0ee98c25c 100644
--- a/java/com/android/incallui/InCallActivity.java
+++ b/java/com/android/incallui/InCallActivity.java
@@ -382,6 +382,12 @@ public class InCallActivity extends TransactionSafeFragmentActivity
         this,
         preferredAccountFuture,
         result -> {
+          if (!isVisible()) {
+            LogUtil.i(
+                "CallingAccountSelector.showPhoneAccountSelectionDialog",
+                "activity ended before result returned");
+            return;
+          }
           if (result.getPhoneAccountHandle().isPresent()) {
             Logger.get(this).logImpression(Type.DUAL_SIM_SELECTION_PREFERRED_USED);
             selectPhoneAccountListener.onPhoneAccountSelected(
-- 
cgit v1.2.3