diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-11-21 03:22:56 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-11-21 03:22:56 +0000 |
commit | a3990fc2f6450cbd8c2376d0533a4120c239b38b (patch) | |
tree | 97d069219555b8ea5b4f0deaa067231be678cdbb /java/com/android/dialer/precall/impl/PreCallCoordinatorImpl.java | |
parent | 861bb9d4402c1b9ee68e9382570f0fca3783478e (diff) | |
parent | 236d6dbb0f6a7d352345b0a59fa21499ad55c2d5 (diff) |
Merge changes I73982924,Ic0747302,I8202a760,Icd66f8eb,I17091560, ...
* changes:
Quick fix recursively importing.
Add impression to track when users explicitly disable assisted dialing.
Initialize executors before updating change PIN state
Remove assert on StubVoicemailClient.addActivationStateListener()
Implement SIM selection dialog
Clear pendingAction when pausing PreCallCoordinator
Add fast database populating button for benefit of testing.
Diffstat (limited to 'java/com/android/dialer/precall/impl/PreCallCoordinatorImpl.java')
-rw-r--r-- | java/com/android/dialer/precall/impl/PreCallCoordinatorImpl.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/java/com/android/dialer/precall/impl/PreCallCoordinatorImpl.java b/java/com/android/dialer/precall/impl/PreCallCoordinatorImpl.java index 485823e9a..de32cc2ae 100644 --- a/java/com/android/dialer/precall/impl/PreCallCoordinatorImpl.java +++ b/java/com/android/dialer/precall/impl/PreCallCoordinatorImpl.java @@ -76,6 +76,7 @@ public class PreCallCoordinatorImpl implements PreCallCoordinator { currentAction.onDiscard(); } currentAction = null; + pendingAction = null; } void onSaveInstanceState(Bundle outState) { |