summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorlinyuh <linyuh@google.com>2018-06-07 11:03:48 -0700
committerCopybara-Service <copybara-piper@google.com>2018-06-07 11:05:22 -0700
commitf62092d487723bb12e75767f31bcc0fd27209adc (patch)
tree0c39b7b28682eaa0e6384540f5dd79ee757a389c /java
parent820df85982fb0fd03b966c3fc5a48c8946eaa4ed (diff)
Set the preferred SIM when InCallActivity is not visible.
Bug: 109653872 Test: N/A (InCallActivity is not testable, similar to cl/194824783). PiperOrigin-RevId: 199662982 Change-Id: I4effa2454246d852837d0878246898537f799980
Diffstat (limited to 'java')
-rw-r--r--java/com/android/incallui/InCallActivity.java13
1 files changed, 7 insertions, 6 deletions
diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java
index a550ddeae..46affdfcc 100644
--- a/java/com/android/incallui/InCallActivity.java
+++ b/java/com/android/incallui/InCallActivity.java
@@ -380,12 +380,6 @@ public class InCallActivity extends TransactionSafeFragmentActivity
this,
preferredAccountFuture,
result -> {
- if (!isVisible()) {
- LogUtil.i(
- "CallingAccountSelector.showPhoneAccountSelectionDialog",
- "activity ended before result returned");
- return;
- }
String callId = waitingForAccountCall.getId();
if (result.getSelectedPhoneAccountHandle().isPresent()) {
selectPhoneAccountListener.onPhoneAccountSelected(
@@ -393,6 +387,13 @@ public class InCallActivity extends TransactionSafeFragmentActivity
return;
}
+ if (!isVisible()) {
+ LogUtil.i(
+ "InCallActivity.showPhoneAccountSelectionDialog",
+ "activity ended before result returned");
+ return;
+ }
+
waitingForAccountCall.setPreferredAccountRecorder(
new PreferredAccountRecorder(
waitingForAccountCall.getNumber(),