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

Commit 0df7c98a authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Remove @Nullable annotation from getDrawable() methods" into nyc-dev

parents 5f8e0603 fde02137

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

+0 −4
Original line number Diff line number Diff line
@@ -769,7 +769,6 @@ public class Resources { 
     * @deprecated Use {@link #getDrawable(int, Theme)} instead.

     */

    @Deprecated

    @Nullable

    public Drawable getDrawable(@DrawableRes int id) throws NotFoundException {

        final Drawable d = getDrawable(id, null);

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

     *         not exist.

     */

    @Nullable

    public Drawable getDrawable(@DrawableRes int id, @Nullable Theme theme)

            throws NotFoundException {

        final TypedValue value = obtainTempTypedValue(id);
@@ -832,7 +830,6 @@ public class Resources { 
     * @deprecated Use {@link #getDrawableForDensity(int, int, Theme)} instead.

     */

    @Deprecated

    @Nullable

    public Drawable getDrawableForDensity(@DrawableRes int id, int density)

            throws NotFoundException {

        return getDrawableForDensity(id, density, null);
@@ -852,7 +849,6 @@ public class Resources { 
     * @throws NotFoundException Throws NotFoundException if the given ID does

     *             not exist.

     */

    @Nullable

    public Drawable getDrawableForDensity(@DrawableRes int id, int density, @Nullable Theme theme) {

        final TypedValue value = obtainTempTypedValue(id);

        try {