diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-05-11 22:46:59 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-05-11 22:46:59 +0000 |
commit | 799c27b3de2ab0b41ffcabe8c87657e3fba2a0b6 (patch) | |
tree | 92cb582d089b517dad54bf88e03fbf0a8f46aa4e /java | |
parent | 14ceb5d6cee235b772f5f3dba38802665f12ab66 (diff) | |
parent | 24aebf075911a84174a3f7382dd88dac008affec (diff) |
Merge "Don't show select SIM dialog after the pre call action has been discarded"
Diffstat (limited to 'java')
-rw-r--r-- | java/com/android/dialer/precall/impl/CallingAccountSelector.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/java/com/android/dialer/precall/impl/CallingAccountSelector.java b/java/com/android/dialer/precall/impl/CallingAccountSelector.java index b22e4d973..b2a659348 100644 --- a/java/com/android/dialer/precall/impl/CallingAccountSelector.java +++ b/java/com/android/dialer/precall/impl/CallingAccountSelector.java @@ -132,6 +132,10 @@ public class CallingAccountSelector implements PreCallAction { phoneNumber, activity.getSystemService(TelecomManager.class).getCallCapablePhoneAccounts()), result -> { + if (isDiscarding) { + // pendingAction is dropped by the coordinator before onDiscard is triggered. + return; + } if (result.getSelectedPhoneAccountHandle().isPresent()) { if (result.getSuggestion().isPresent() |