commit 86ac1421cd466d03263c38aa17d32b8781f04fc7
author Jeff DeCew <jeffdq@google.com> Wed Mar 24 16:04:56 2021 -0400
committer Jeff DeCew <jeffdq@google.com> Wed Mar 24 16:08:41 2021 -0400
tree e6d498c8b44fe2ab9c493f74fa8c5c1e460aeb4f
parent 5e8f6cf915a6c70003db8dd258d2a32e29dc1d16

Test that TypedArray is AutoCloseable

Bug: 170316676
Test: atest TypedArrayTest
Change-Id: I28c20f4efe0d7569294352b28752915709470cfc

tests/tests/content/src/android/content/res/cts/TypedArrayTest.java

diff --git a/tests/tests/content/src/android/content/res/cts/TypedArrayTest.java b/tests/tests/content/src/android/content/res/cts/TypedArrayTest.java
index d98bda8..604c13d 100644
--- a/tests/tests/content/src/android/content/res/cts/TypedArrayTest.java
+++ b/tests/tests/content/src/android/content/res/cts/TypedArrayTest.java
@@ -270,6 +270,15 @@
         test.recycle();
     }
 
+    public void testAutoCloseable() {
+        final ContextThemeWrapper contextThemeWrapper = new ContextThemeWrapper(getContext(), 0);
+        contextThemeWrapper.setTheme(R.style.TextAppearance);
+        try (TypedArray ta = contextThemeWrapper.getTheme().obtainStyledAttributes(
+                R.styleable.TextAppearance)) {
+            ta.getIndexCount();
+        }
+    }
+
     public void testNonResourceString() throws XmlPullParserException, IOException {
         final XmlResourceParser parser = getContext().getResources().getXml(R.xml.test_color);
         XmlUtils.beginDocument(parser, XML_BEGIN);
@@ -293,12 +302,9 @@
             final Resources.Theme theme = resources.newTheme();
             theme.applyStyle(R.style.Whatever, false);
 
-            final TypedArray ta = theme.obtainStyledAttributes(parser, R.styleable.style1, 0, 0);
-            try {
+            try (TypedArray ta = theme.obtainStyledAttributes(parser, R.styleable.style1, 0, 0)) {
                 assertTrue(ta.hasValueOrEmpty(R.styleable.style1_type1));
                 assertEquals(TypedValue.TYPE_NULL, ta.getType(R.styleable.style1_type1));
-            } finally {
-                ta.recycle();
             }
         }
     }