| commit | a79e06651143db1b44b37eb9f3acb743ec45790d | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Fri May 27 10:12:36 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri May 27 10:12:36 2011 -0700 |
| tree | 2a4cf707b356eb6398563a673e22e59684d4819a | |
| parent | 405220c6759326bb0ceaa8779b6358cc2ed1968a [diff] | |
| parent | 022aff486648aa159fe990b38c1fb1968b2ca10d [diff] |
Merge "Tracking merge of dalvik-dev to master"
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/JarHostTest.java b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/JarHostTest.java index 5f06d99..5c1762f 100644 --- a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/JarHostTest.java +++ b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/JarHostTest.java
@@ -208,7 +208,7 @@ public void cancel() { // ignore } - }); + }, true); if (status.equals(CommandStatus.TIMED_OUT)) { junitResult.addError(junitTest, new TestTimeoutException()); junitResult.endTest(junitTest);