diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-06-07 19:50:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-06-07 19:50:14 +0000 |
| commit | 5749edd52e1b5fb772dfe127b87a48f6b943a1ef (patch) | |
| tree | 0c39b7b28682eaa0e6384540f5dd79ee757a389c | |
| parent | c8d58599d7fdcee444e3255104c0043a6f459e43 (diff) | |
| parent | f62092d487723bb12e75767f31bcc0fd27209adc (diff) | |
Merge "Set the preferred SIM when InCallActivity is not visible."
| -rw-r--r-- | java/com/android/incallui/InCallActivity.java | 13 |
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(), |