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

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

Merge "Avoid NPE when drawable fails to load" into mnc-dev

parents 42cc892b 0f1c95ed

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

+3 −2
Original line number Diff line number Diff line
@@ -2486,7 +2486,8 @@ public class Resources { 
        return true;

    }



    /*package*/ Drawable loadDrawable(TypedValue value, int id, Theme theme) throws NotFoundException {

    @Nullable

    Drawable loadDrawable(TypedValue value, int id, Theme theme) throws NotFoundException {

        if (TRACE_FOR_PRELOAD) {

            // Log only framework resources

            if ((id >>> 24) == 0x1) {
@@ -2541,7 +2542,7 @@ public class Resources { 
        // Determine if the drawable has unresolved theme attributes. If it

        // does, we'll need to apply a theme and store it in a theme-specific

        // cache.

        final boolean canApplyTheme = dr.canApplyTheme();

        final boolean canApplyTheme = dr != null && dr.canApplyTheme();

        if (canApplyTheme && theme != null) {

            dr = dr.mutate();

            dr.applyTheme(theme);