diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-02-16 01:07:28 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-02-16 01:07:28 +0000 |
| commit | 4ebd428aa3afc832752c758397fad5d5f73c1574 (patch) | |
| tree | f8164a04bd5a75dfd9fc4d8d816eddb51530b615 | |
| parent | 62d55af4c9d367bb3e8a148bba5383f06bfde76f (diff) | |
| parent | ecd25decb84824c60cbef7270ebd3aa930d31f5f (diff) | |
| download | apache-harmony-4ebd428aa3afc832752c758397fad5d5f73c1574.tar.gz | |
Snap for 8188146 from ecd25decb84824c60cbef7270ebd3aa930d31f5f to tm-frc-documentsui-release
Change-Id: I460b388be265e5d70102316c465edc89d7c468d3
| -rw-r--r-- | Android.bp | 5 | ||||
| -rw-r--r-- | jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/TestOptions.java | 2 |
2 files changed, 2 insertions, 5 deletions
@@ -75,9 +75,6 @@ java_test { // b/73499927 errorprone: { - javacflags: [ - "-Xep:MissingOverride:OFF", - "-Xep:DoNotCall:OFF", - ], + javacflags: ["-Xep:MissingOverride:OFF"], }, } diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/TestOptions.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/TestOptions.java index f36da99..fa9882d 100644 --- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/TestOptions.java +++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/TestOptions.java @@ -82,7 +82,7 @@ import java.util.HashMap; public class TestOptions { /** Default timeout value for various operations. */ - public static final int DEFAULT_TIMEOUT = 2 * 60 * 1000; // 2 minutes + public static final int DEFAULT_TIMEOUT = 1 * 60 * 1000; // 1 minute /** Default time interval for waiting for various events. */ public static final int DEFAULT_WAITING_TIME = DEFAULT_TIMEOUT; |