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

Commit 67c55be3 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am 0d05788f: am 760cfb02: Merge "Check for null drawable in theme-less... 

am 0d05788f: am 760cfb02: Merge "Check for null drawable in theme-less getDrawable()" into lmp-mr1-dev

* commit '0d05788f':
  Check for null drawable in theme-less getDrawable()
parents e19bb5c0 0d05788f

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

+1 −1
Original line number Diff line number Diff line
@@ -747,7 +747,7 @@ public class Resources { 
     */

    public Drawable getDrawable(int id) throws NotFoundException {

        final Drawable d = getDrawable(id, null);

        if (d.canApplyTheme()) {

        if (d != null && d.canApplyTheme()) {

            Log.w(TAG, "Drawable " + getResourceName(id) + " has unresolved theme "

                    + "attributes! Consider using Resources.getDrawable(int, Theme) or "

                    + "Context.getDrawable(int).", new RuntimeException());