diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-11-18 09:16:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-11-18 09:16:18 +0000 |
| commit | 3b450ceb4290364df58a541c60cc690cc36ba4c8 (patch) | |
| tree | c9bb61716fc202d23c4966a1d2407cfa09744791 /java/com/android/dialer/binary/basecomponent | |
| parent | a8b9f7de79559caef0aaab7dc05f585314024790 (diff) | |
| parent | 7f1076d08b39467ac8c550f60a7fbbad604ab4fa (diff) | |
Merge changes Iee4e3db8,I6e74c7fe,Ibe722477,Ia22751f0,Ic28fb197, ...
* changes:
DialpadView cleanup.
Merge the following methods in InCallActivityCommon into InCallActivity:
Add contact source options.
Automated rollback of changelist 174944384
Refactoring and adding TOS check before transcribing
Adding exponential backoff utilities
Implement suggested SIM
Fix dialer simulator for conference calling funcitonality. Updated the following contents: 1.Fix the order of spawning connections for GSM conference. 2.Make VOLTE conference call more realistic. 3.Fix minor bugs about simulator. 4.Add SimulatorConnectionsBank class to store connection tags created by simulator. 5.Fix tests influenced by SimulatorConnectionsBank.
Diffstat (limited to 'java/com/android/dialer/binary/basecomponent')
| -rw-r--r-- | java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java b/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java index 387fca530..d5c91c90a 100644 --- a/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java +++ b/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java @@ -26,6 +26,7 @@ import com.android.dialer.main.MainComponent; import com.android.dialer.phonelookup.PhoneLookupComponent; import com.android.dialer.phonenumbergeoutil.PhoneNumberGeoUtilComponent; import com.android.dialer.precall.PreCallComponent; +import com.android.dialer.preferredsim.suggestion.SimSuggestionComponent; import com.android.dialer.simulator.SimulatorComponent; import com.android.dialer.storage.StorageComponent; import com.android.dialer.strictmode.StrictModeComponent; @@ -50,6 +51,7 @@ public interface BaseDialerRootComponent PhoneLookupComponent.HasComponent, PhoneNumberGeoUtilComponent.HasComponent, PreCallComponent.HasComponent, + SimSuggestionComponent.HasComponent, SimulatorComponent.HasComponent, StorageComponent.HasComponent, StrictModeComponent.HasComponent, |