summaryrefslogtreecommitdiff
path: root/java/com/android
diff options
context:
space:
mode:
authortwyen <twyen@google.com>2018-04-30 12:13:06 -0700
committerCopybara-Service <copybara-piper@google.com>2018-04-30 18:17:43 -0700
commit3b2c7814d05cef19a7e4797d5a756621cc0eeb77 (patch)
tree4c6e5c2591b825e6d84d4e0714e598c9d904d858 /java/com/android
parent71bf7e4d449fa28a644658b01029b7475a4a4162 (diff)
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
Diffstat (limited to 'java/com/android')
-rw-r--r--java/com/android/incallui/InCallActivity.java6
1 files changed, 6 insertions, 0 deletions
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(