Remove shortname for session-id in SubPlanCreator
The short name "s" collides with the short name for tradefed's "serial" option and causes retry to fail for sessions specifying serial numbers.
Test: run cts -m CtsPreferenceTestCases -s <device-serial>, then retry with run cts -r <last session>
bug: 32703023
bug: 32707500
Change-Id: I0b71477a29f51bd8dfc81de1fd785da079499f17
(cherry picked from commit 6d72c231304d7b59c555dd0ee9711997dfda5421)
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/command/CompatibilityConsole.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/command/CompatibilityConsole.java
index b8ab089..e6b33a5 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/command/CompatibilityConsole.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/command/CompatibilityConsole.java
@@ -214,7 +214,7 @@
helpBuilder.append("Add:\n");
helpBuilder.append(" a/add s/subplan: create a subplan from a previous session\n");
helpBuilder.append("Options:\n");
- helpBuilder.append(" --session/-s <session_id>: The session used to create a subplan.\n");
+ helpBuilder.append(" --session <session_id>: The session used to create a subplan.\n");
helpBuilder.append(" --name/-n <subplan_name>: The name of the new subplan.\n");
helpBuilder.append(" --result-type/-r <status>: Which results to include in the");
helpBuilder.append(" subplan. One of passed, failed, not_executed. Repeatable.\n");
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/SubPlanCreator.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/SubPlanCreator.java
index cbe3d2e..7d6d77f 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/SubPlanCreator.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/SubPlanCreator.java
@@ -69,7 +69,7 @@
importance=Importance.IF_UNSET)
private String mSubPlanName = null;
- @Option (name = "session", shortName = 's', description = "the session id to derive from",
+ @Option (name = "session", description = "the session id to derive from",
importance=Importance.IF_UNSET)
private Integer mSessionId = null;
