Merge "Merge "Merge "Suppress TryFailThrowable ErrorProne warnings due to test change" into android12-tests-dev am: f92c0e6c59" into android12L-tests-dev am: 4c569156ac" into android13-tests-dev am: 6f28d92e22 am: bfdd3d8fb8

Original change: https://android-review.googlesource.com/c/platform/libcore/+/2629111

Change-Id: If7ff5f36d5cd9fb2743637f56cf7f35e0fd24b35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3 files changed, 5 insertions, 0 deletions

diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/CharsetDecoderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/CharsetDecoderTest.java
index 8028ef8e992..4677b26708e 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/CharsetDecoderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/CharsetDecoderTest.java
@@ -232,6 +232,7 @@ public class CharsetDecoderTest extends TestCase {
         assertCharBufferValue(getString(), out);
     }
 
+    @SuppressWarnings("TryFailThrowable")
     public void testDecodeByteBufferException()
             throws CharacterCodingException, UnsupportedEncodingException {
         CharBuffer out;
@@ -507,6 +508,7 @@ public class CharsetDecoderTest extends TestCase {
                 readOnly(getExceptionByteArray()), false);
     }
 
+    @SuppressWarnings("TryFailThrowable")
     void implTestDecodeCharBufferByteBufferException(ByteBuffer in,
             boolean endOfInput) throws CharacterCodingException,
             UnsupportedEncodingException {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/CharsetEncoderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/CharsetEncoderTest.java
index fec07fac531..359b02069d0 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/CharsetEncoderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/CharsetEncoderTest.java
@@ -624,6 +624,7 @@ public class CharsetEncoderTest extends TestCase {
 		return CharBuffer.wrap("runtime buffer");
 	}
 
+        @SuppressWarnings("TryFailThrowable")
 	public void testEncodeCharBufferException() throws CharacterCodingException {
 		ByteBuffer out;
 		CharBuffer in;
@@ -826,6 +827,7 @@ public class CharsetEncoderTest extends TestCase {
 		return result;
 	}
 
+        @SuppressWarnings("TryFailThrowable")
 	protected void implTestEncodeCharBufferByteBufferbooleanException(
 			boolean endOfInput) throws CharacterCodingException {
 		ByteBuffer out = ByteBuffer.allocate(100);
diff --git a/luni/src/test/java/libcore/java/lang/StringTest.java b/luni/src/test/java/libcore/java/lang/StringTest.java
index bd60e4fbed6..4c87aaf5079 100644
--- a/luni/src/test/java/libcore/java/lang/StringTest.java
+++ b/luni/src/test/java/libcore/java/lang/StringTest.java
@@ -88,6 +88,7 @@ public class StringTest extends TestCase {
         public CharsetDecoder newDecoder() { return new EvilCharsetDecoder(this); }
     };
 
+    @SuppressWarnings("TryFailThrowable")
     public void testGetBytes_MaliciousCharset() {
         try {
             String s = "hi";