Adding ability to pass additional Monkey parameters.

Change-Id: Id4476c125cf146181287fcc57e6fc76332029b22
diff --git a/prod-tests/src/com/android/monkey/MonkeyBase.java b/prod-tests/src/com/android/monkey/MonkeyBase.java
index e84eb7b..b3cc9d0 100644
--- a/prod-tests/src/com/android/monkey/MonkeyBase.java
+++ b/prod-tests/src/com/android/monkey/MonkeyBase.java
@@ -162,6 +162,10 @@
     @Option(name = "idle-time", description = "How long to sleep before running monkey, in secs")
     private int mIdleTimeSecs = 5 * 60;
 
+    @Option(name = "monkey-arg", description = "Extra parameters to pass onto monkey. Key/value " +
+            "pairs should be passed as key:value. May be repeated.")
+    private Collection<String> mMonkeyArgs = new LinkedList<String>();
+
     @Option(name = "use-pkg-whitelist-file", description = "Whether to use the monkey " +
             "--pkg-whitelist-file option to work around cmdline length limits")
     private boolean mUseWhitelistFile = false;
@@ -388,6 +392,14 @@
             cmdList.add(DEVICE_WHITELIST_PATH);
         }
 
+        for (String arg : mMonkeyArgs) {
+            String[] args = arg.split(":");
+            cmdList.add(String.format("--%s", args[0]));
+            if (args.length > 1) {
+                cmdList.add(args[1]);
+            }
+        }
+
         cmdList.addAll(mOptions);
 
         cmdList.add("-s");