Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alan Viverette
2014-11-24 21:57:49 +00:00
committed by Android (Google) Code Review
parent 8c81609616 7e0aaae3db
commit 760cfb02de
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/content/res/Resources.java
View File

@@ -747,7 +747,7 @@ public class Resources {
*/ */
public Drawable getDrawable(int id) throws NotFoundException { public Drawable getDrawable(int id) throws NotFoundException {
final Drawable d = getDrawable(id, null); final Drawable d = getDrawable(id, null);
if (d.canApplyTheme()) { if (d != null && d.canApplyTheme()) {
Log.w(TAG, "Drawable " + getResourceName(id) + " has unresolved theme " Log.w(TAG, "Drawable " + getResourceName(id) + " has unresolved theme "
+ "attributes! Consider using Resources.getDrawable(int, Theme) or " + "attributes! Consider using Resources.getDrawable(int, Theme) or "
+ "Context.getDrawable(int).", new RuntimeException()); + "Context.getDrawable(int).", new RuntimeException());