| commit | ff84ff49fc6be89aeba7d093a93839aabb5bcac1 | [log] [tgz] |
|---|---|---|
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | Tue Mar 13 15:26:41 2018 +0000 |
| committer | android-build-prod (mdb) <android-build-team-robot@google.com> | Tue Mar 13 15:26:41 2018 +0000 |
| tree | 0819122e7d92aa6979222766943d5c6737f624ab | |
| parent | 4d24ab2ba9b559a59aca0ba706784c57fa4b17f7 [diff] | |
| parent | f650568179061c026ed31553feadbe437153f67c [diff] |
Snap for 4649591 from f650568179061c026ed31553feadbe437153f67c to oreo-mr1-cts-release Change-Id: I958b6cb69096208f99cd99fd686baeca65f650ac
diff --git a/android_icu4j/src/main/tests/android/icu/dev/test/translit/TransliteratorTest.java b/android_icu4j/src/main/tests/android/icu/dev/test/translit/TransliteratorTest.java index fdb0468..2ca3946 100644 --- a/android_icu4j/src/main/tests/android/icu/dev/test/translit/TransliteratorTest.java +++ b/android_icu4j/src/main/tests/android/icu/dev/test/translit/TransliteratorTest.java
@@ -3093,7 +3093,9 @@ } } - @Test + // Android-changed: Added an explicit timeout because it is too slow to run on some Wear devices + // with the default. http://b/65468170 + @Test(timeout = 3_000_000L) public void TestSourceTargetSet2() {
diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java index d4bb806..7568717 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java +++ b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java
@@ -3090,7 +3090,9 @@ } } - @Test + // Android-changed: Added an explicit timeout because it is too slow to run on some Wear devices + // with the default. http://b/65468170 + @Test(timeout = 3_000_000L) public void TestSourceTargetSet2() {