commit dd31e3c7cf5e41fa1f978092a9e7ae775ec38342
author Mike Rieker <mrieker@nii.net> Tue Jul 20 15:39:45 2010 -0400
committer Brian Muramatsu <btmura@android.com> Mon Sep 13 14:51:38 2010 -0700
tree 8ba5c7bd60dcdd2862a7843cd5a810fefc7bbd03
parent 7c33f53258440846eb01c5987d22cc4c3c562d50

--device option sometimes ignored on start command
when used with --test option

the value fetched from the option was overridden from
a value retrieved from a previous session.  this change
lets the --device option have the final say.

Change-Id: I79a87faf6591944a082b96ffeb372214a47a04b5

tools/host/src/com/android/cts/ConsoleUi.java

diff --git a/tools/host/src/com/android/cts/ConsoleUi.java b/tools/host/src/com/android/cts/ConsoleUi.java
index 679ecc0..951e3e9 100644
--- a/tools/host/src/com/android/cts/ConsoleUi.java
+++ b/tools/host/src/com/android/cts/ConsoleUi.java
@@ -451,15 +451,6 @@
                 return;
             }
 
-            if (cp.containsKey(CTSCommand.OPTION_DEVICE)) {
-                deviceId = cp.getValue(CTSCommand.OPTION_DEVICE);
-                String[] deviceIdList = deviceId.trim().split(",");
-                if (deviceIdList.length > 1) {
-                    Log.e("Just allow choosing one device ID.", null);
-                    return;
-                }
-            }
-
             ActionType actionType = ActionType.START_NEW_SESSION;
             if (cp.containsKey(CTSCommand.OPTION_TEST)) {
                 testName = cp.getValue(CTSCommand.OPTION_TEST);
@@ -493,6 +484,15 @@
                 }
             }
 
+            if (cp.containsKey(CTSCommand.OPTION_DEVICE)) {
+                deviceId = cp.getValue(CTSCommand.OPTION_DEVICE);
+                String[] deviceIdList = deviceId.trim().split(",");
+                if (deviceIdList.length > 1) {
+                    Log.e("Just allow choosing one device ID.", null);
+                    return;
+                }
+            }
+
             if (deviceId == null) {
                 TestDevice td = mHost.getFirstAvailableDevice();
                 if (td == null) {