summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2018-09-04 09:21:26 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2018-09-04 09:21:26 +0000
commitcc11cf2ef2a77370c7c8dba59ec95fe0f192234f (patch)
tree972aa53336d3cc9950f32345d6537d147b554de1
parent8ac363088ce16df9d50953c1aed636616513b7d8 (diff)
parent9a9a8789525e9e124e5138e126a152e3beed4f6a (diff)
Merge "Disable tests failing with ICU62"
-rw-r--r--core/tests/coretests/src/android/text/method/ForwardDeleteTest.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/tests/coretests/src/android/text/method/ForwardDeleteTest.java b/core/tests/coretests/src/android/text/method/ForwardDeleteTest.java
index 15dbbc8de150..c98e6460c189 100644
--- a/core/tests/coretests/src/android/text/method/ForwardDeleteTest.java
+++ b/core/tests/coretests/src/android/text/method/ForwardDeleteTest.java
@@ -20,6 +20,7 @@ import android.platform.test.annotations.Presubmit;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
+import android.test.suitebuilder.annotation.Suppress;
import android.text.InputType;
import android.util.KeyUtils;
import android.view.KeyEvent;
@@ -238,6 +239,7 @@ public class ForwardDeleteTest {
}
@Test
+ @Suppress
public void testEmojiModifier() {
EditorState state = new EditorState();
@@ -267,6 +269,7 @@ public class ForwardDeleteTest {
}
@Test
+ @Suppress
public void testMixedEdgeCases() {
EditorState state = new EditorState();