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

Commit 1eb35de5 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am 0cd6296c: am 63c7a655: am 1b33396e: Merge "Deprecate... 

am 0cd6296c: am 63c7a655: am 1b33396e: Merge "Deprecate Resources.getDrawable(int) in favor of the two-arg version" into lmp-mr1-dev

* commit '0cd6296c':
  Deprecate Resources.getDrawable(int) in favor of the two-arg version
parents 58d3ddae 0cd6296c

core/java/android/content/res/Resources.java

+4 −0
Original line number Diff line number Diff line
@@ -744,7 +744,10 @@ public class Resources { 
     * @throws NotFoundException Throws NotFoundException if the given ID does

     *         not exist.

     * @see #getDrawable(int, Theme)

     * @deprecated Use {@link #getDrawable(int, Theme)} instead.

     */

    @Deprecated

    @Nullable

    public Drawable getDrawable(int id) throws NotFoundException {

        final Drawable d = getDrawable(id, null);

        if (d != null && d.canApplyTheme()) {
@@ -769,6 +772,7 @@ public class Resources { 
     * @throws NotFoundException Throws NotFoundException if the given ID does

     *         not exist.

     */

    @Nullable

    public Drawable getDrawable(int id, @Nullable Theme theme) throws NotFoundException {

        TypedValue value;

        synchronized (mAccessLock) {