summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/precall
diff options
context:
space:
mode:
authortwyen <twyen@google.com>2018-05-11 14:10:36 -0700
committerCopybara-Service <copybara-piper@google.com>2018-05-11 15:28:29 -0700
commit24aebf075911a84174a3f7382dd88dac008affec (patch)
tree92cb582d089b517dad54bf88e03fbf0a8f46aa4e /java/com/android/dialer/precall
parent14ceb5d6cee235b772f5f3dba38802665f12ab66 (diff)
Don't show select SIM dialog after the pre call action has been discarded
If the PreferredAccountWorker completed after a rotation, it might show a dialog from the previous action which is no longer valid. TEST=TAP Bug: 79530586 Test: TAP PiperOrigin-RevId: 196306574 Change-Id: I1d64eb63ad4f0bbe0ccdb7b8f73f638f67c56070
Diffstat (limited to 'java/com/android/dialer/precall')
-rw-r--r--java/com/android/dialer/precall/impl/CallingAccountSelector.java4
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()