Merge "Add a 'removeInstrumentationArg' method to ddms testrunner."

2 files changed, 17 insertions, 0 deletions

diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/IRemoteAndroidTestRunner.java b/ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/IRemoteAndroidTestRunner.java
index b40f164..cd40527 100644
--- a/ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/IRemoteAndroidTestRunner.java
+++ b/ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/IRemoteAndroidTestRunner.java
@@ -135,6 +135,13 @@ public interface IRemoteAndroidTestRunner {
     public void addInstrumentationArg(String name, String value);
 
     /**
+     * Removes a previously added argument.
+     *
+     * @param name the name of the instrumentation bundle argument to remove
+     */
+    public void removeInstrumentationArg(String name);
+
+    /**
      * Adds a boolean argument to include in instrumentation command.
      * <p/>
      * @see RemoteAndroidTestRunner#addInstrumentationArg
diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/RemoteAndroidTestRunner.java b/ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/RemoteAndroidTestRunner.java
index 0d22886..c0ae309 100644
--- a/ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/RemoteAndroidTestRunner.java
+++ b/ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/RemoteAndroidTestRunner.java
@@ -156,6 +156,16 @@ public class RemoteAndroidTestRunner implements IRemoteAndroidTestRunner  {
     /**
      * {@inheritDoc}
      */
+    public void removeInstrumentationArg(String name) {
+        if (name == null) {
+            throw new IllegalArgumentException("name argument cannot be null");
+        }
+        mArgMap.remove(name);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
     public void addBooleanArg(String name, boolean value) {
         addInstrumentationArg(name, Boolean.toString(value));
     }