Merge "Check for null drawable in theme-less getDrawable()" into lmp-mr1-dev

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

@@ -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());