summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/commandline/CommandLineModule.java
diff options
context:
space:
mode:
authorEric Erfanian <erfanian@google.com>2018-04-25 19:00:11 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-04-25 19:00:11 +0000
commit43ed0dc0666e9d2e2837a2019e2765f10f43dff8 (patch)
treeac6491831c0d331f8582a65eda60143cb0798fd0 /java/com/android/dialer/commandline/CommandLineModule.java
parent34ed7da073bbac5b8a4283c495c588ef3b0ea32b (diff)
parent79a407ee27e6c8f6447f3a8c71ae2c7f6b33f591 (diff)
Merge changes I5b8ad5ca,I0011019c,I8ee43ce8,I35e0748a,I9e9947ad, ...
* changes: Show clear frequents option in the toolbar if there are suggested contacts. Use UI listener for preferred account worker in in call UI Make SIM Selection hint multi-line Convert CequintCallerIdContact into an @AutoValue Newly starred SpeedDialUiItems now have SpeedDialEntry ids set. Disable entries in CallingAccountSelector that are not selectable Add "enabled" to SelectPhoneAccountDialogFragment. Add skeleton for CequintPhoneLookup Log send button impressions for RTT call. Show international call on wifi dialog without InCallActivity. Expose active calls from in call UI
Diffstat (limited to 'java/com/android/dialer/commandline/CommandLineModule.java')
-rw-r--r--java/com/android/dialer/commandline/CommandLineModule.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/java/com/android/dialer/commandline/CommandLineModule.java b/java/com/android/dialer/commandline/CommandLineModule.java
index 915578722..c78de21e5 100644
--- a/java/com/android/dialer/commandline/CommandLineModule.java
+++ b/java/com/android/dialer/commandline/CommandLineModule.java
@@ -16,6 +16,7 @@
package com.android.dialer.commandline;
+import com.android.dialer.commandline.impl.ActiveCallsCommand;
import com.android.dialer.commandline.impl.BlockingCommand;
import com.android.dialer.commandline.impl.CallCommand;
import com.android.dialer.commandline.impl.Echo;
@@ -45,6 +46,7 @@ public abstract class CommandLineModule {
private final Echo echo;
private final BlockingCommand blockingCommand;
private final CallCommand callCommand;
+ private final ActiveCallsCommand activeCallsCommand;
@Inject
AospCommandInjector(
@@ -52,12 +54,14 @@ public abstract class CommandLineModule {
Version version,
Echo echo,
BlockingCommand blockingCommand,
- CallCommand callCommand) {
+ CallCommand callCommand,
+ ActiveCallsCommand activeCallsCommand) {
this.help = help;
this.version = version;
this.echo = echo;
this.blockingCommand = blockingCommand;
this.callCommand = callCommand;
+ this.activeCallsCommand = activeCallsCommand;
}
public CommandSupplier.Builder inject(CommandSupplier.Builder builder) {
@@ -66,6 +70,7 @@ public abstract class CommandLineModule {
builder.addCommand("echo", echo);
builder.addCommand("blocking", blockingCommand);
builder.addCommand("call", callCommand);
+ builder.addCommand("activecalls", activeCallsCommand);
return builder;
}
}