diff options
| author | 2018-04-10 20:32:20 +0000 | |
|---|---|---|
| committer | 2018-04-10 20:32:20 +0000 | |
| commit | 55ae317213ef01ba6ea3dd93a1967a0feeafc63c (patch) | |
| tree | e46fc37fb5e71da814ce5abe7d961d5f0deb297e | |
| parent | fd34bcc397d53ebccb699df360cc995ddb677bd8 (diff) | |
| parent | bd1632355ec72a7a893334a87d103d11ba4c2593 (diff) | |
Merge "Fix {Spanned|Spannable}StringNoCopyTest test cases" into pi-dev
| -rw-r--r-- | core/tests/coretests/src/android/text/SpannableStringNoCopyTest.java | 4 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/text/SpannedStringNoCopyTest.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/tests/coretests/src/android/text/SpannableStringNoCopyTest.java b/core/tests/coretests/src/android/text/SpannableStringNoCopyTest.java index c205f9695bb8..6c05601a31fd 100644 --- a/core/tests/coretests/src/android/text/SpannableStringNoCopyTest.java +++ b/core/tests/coretests/src/android/text/SpannableStringNoCopyTest.java @@ -54,7 +54,7 @@ public class SpannableStringNoCopyTest { first.setSpan(new UnderlineSpan(), 0, first.length(), Spanned.SPAN_PRIORITY); // Do not copy NoCopySpan if specified so. - final SpannedString copied = new SpannedString(first, false /* copyNoCopySpan */); + final SpannedString copied = new SpannedString(first, true /* ignoreNoCopySpan */); final Object[] spans = copied.getSpans(0, copied.length(), Object.class); assertNotNull(spans); assertEquals(2, spans.length); @@ -87,7 +87,7 @@ public class SpannableStringNoCopyTest { // Do not copy NoCopySpan if specified so. final SpannedString copied = new SpannedString( - new CustomSpannable(first), false /* copyNoCopySpan */); + new CustomSpannable(first), true /* ignoreNoCopySpan */); final Object[] spans = copied.getSpans(0, copied.length(), Object.class); assertNotNull(spans); assertEquals(2, spans.length); diff --git a/core/tests/coretests/src/android/text/SpannedStringNoCopyTest.java b/core/tests/coretests/src/android/text/SpannedStringNoCopyTest.java index 068092484b1b..380e3153ccda 100644 --- a/core/tests/coretests/src/android/text/SpannedStringNoCopyTest.java +++ b/core/tests/coretests/src/android/text/SpannedStringNoCopyTest.java @@ -54,7 +54,7 @@ public class SpannedStringNoCopyTest { first.setSpan(new UnderlineSpan(), 0, first.length(), Spanned.SPAN_PRIORITY); // Do not copy NoCopySpan if specified so. - final SpannedString copied = new SpannedString(first, false /* copyNoCopySpan */); + final SpannedString copied = new SpannedString(first, true /* ignoreNoCopySpan */); final Object[] spans = copied.getSpans(0, copied.length(), Object.class); assertNotNull(spans); assertEquals(2, spans.length); @@ -87,7 +87,7 @@ public class SpannedStringNoCopyTest { // Do not copy NoCopySpan if specified so. final SpannedString copied = new SpannedString( - new CustomSpanned(first), false /* copyNoCopySpan */); + new CustomSpanned(first), true /* ignoreNoCopySpan */); final Object[] spans = copied.getSpans(0, copied.length(), Object.class); assertNotNull(spans); assertEquals(2, spans.length); |