1 files changed, 15 insertions, 9 deletions
diff --git a/java/com/android/dialer/commandline/impl/Echo.java b/java/com/android/dialer/commandline/impl/Echo.java
index b5f2f084b..2741a4042 100644
--- a/java/com/android/dialer/commandline/impl/Echo.java
+++ b/java/com/android/dialer/commandline/impl/Echo.java
@@ -19,8 +19,8 @@ package com.android.dialer.commandline.impl;
 import android.support.annotation.NonNull;
 import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
+import com.android.dialer.commandline.Arguments;
 import com.android.dialer.commandline.Command;
-import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import javax.inject.Inject;
@@ -28,18 +28,24 @@ import javax.inject.Inject;
 /** Print arguments. */
 public class Echo implements Command {
 
-  @VisibleForTesting
-  @Inject
-  public Echo() {}
-
+  @NonNull
   @Override
-  public ListenableFuture<String> run(ImmutableList<String> args) {
-    return Futures.immediateFuture(TextUtils.join(" ", args));
+  public String getShortDescription() {
+    return "@hide Print all arguments.";
   }
 
   @NonNull
   @Override
-  public String getShortDescription() {
-    return "@hide Print all arguments.";
+  public String getUsage() {
+    return "echo [arguments...]";
+  }
+
+  @VisibleForTesting
+  @Inject
+  public Echo() {}
+
+  @Override
+  public ListenableFuture<String> run(Arguments args) throws IllegalCommandLineArgumentException {
+    return Futures.immediateFuture(TextUtils.join(" ", args.getPositionals()));
   }
 }