commit 3b2c7814d05cef19a7e4797d5a756621cc0eeb77
author twyen <twyen@google.com> Mon Apr 30 12:13:06 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Mon Apr 30 18:17:43 2018 -0700
tree 4c6e5c2591b825e6d84d4e0714e598c9d904d858
parent 71bf7e4d449fa28a644658b01029b7475a4a4162

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

diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java
index 0f0e9d9..0ee98c2 100644
--- a/java/com/android/incallui/InCallActivity.java
+++ b/java/com/android/incallui/InCallActivity.java
@@ -382,6 +382,12 @@
         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(