Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36d4ce39 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make TypedArray implement AutoCloseable" into sc-dev am: 230fac1c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13985052

Change-Id: Idd83ba3c157be0dc5b0d1117ff9ab6973f35de23
parents 88cfd3f1 230fac1c

core/api/current.txt

+2 −1
Original line number Diff line number Diff line
@@ -13379,7 +13379,8 @@ package android.content.res { 
    method public void setTo(android.content.res.Resources.Theme);

  }













  public class TypedArray {













  public class TypedArray implements java.lang.AutoCloseable {













    method public void close();















    method public boolean getBoolean(@StyleableRes int, boolean);















    method public int getChangingConfigurations();















    method @ColorInt public int getColor(@StyleableRes int, @ColorInt int);

























core/java/android/content/res/TypedArray.java



+12
−1




























Original line number
Diff line number
Diff line








@@ -46,7 +46,7 @@ import java.util.Arrays;













 * The indices used to retrieve values from this structure correspond to















 * the positions of the attributes given to obtainStyledAttributes.















 */













public class TypedArray {













public class TypedArray implements AutoCloseable {































    static TypedArray obtain(Resources res, int len) {















        TypedArray attrs = res.mTypedArrayPool.acquire();










@@ -1252,6 +1252,17 @@ public class TypedArray {













        mResources.mTypedArrayPool.release(this);















    }





























    /**













     * Recycles the TypedArray, to be re-used by a later caller. After calling













     * this function you must not ever touch the typed array again.













     *













     * @see #recycle()













     * @throws RuntimeException if the TypedArray has already been recycled.













     */













    public void close() {













        recycle();













    }





























    /**















     * Extracts theme attributes from a typed array for later resolution using















     * {@link android.content.res.Resources.Theme#resolveAttributes(int[], int[])}.