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

Commit 51fc9ea5 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am 20b9a6c4: am 9e84a6a0: Merge "Fix inaccurate TypedArray.getDrawable()... 

am 20b9a6c4: am 9e84a6a0: Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev

* commit '20b9a6c458f998d1a5d3896e859a65371db9fce2':
  Fix inaccurate TypedArray.getDrawable() documentation
parents c50fb393 60004cae

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

+3 −4
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.content.res;



import android.annotation.Nullable;

import android.graphics.drawable.Drawable;

import android.util.AttributeSet;

import android.util.DisplayMetrics;
@@ -728,15 +729,13 @@ public class TypedArray { 
    }



    /**

     * Retrieve the Drawable for the attribute at <var>index</var>.  This

     * gets the resource ID of the selected attribute, and uses

     * {@link Resources#getDrawable Resources.getDrawable} of the owning

     * Resources object to retrieve its Drawable.

     * Retrieve the Drawable for the attribute at <var>index</var>.

     *

     * @param index Index of attribute to retrieve.

     *

     * @return Drawable for the attribute, or null if not defined.

     */

    @Nullable

    public Drawable getDrawable(int index) {

        if (mRecycled) {

            throw new RuntimeException("Cannot make calls to a recycled instance!");