From f1c0aeda259dd0dbab4356c909d33fe7e1ca0d2a Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Fri, 3 Aug 2012 14:04:30 -0700 Subject: Fix issue #6921726: Prime: Cannot make or receive phone calls... [NPE at android.graphics.drawable.Drawable.createFromResourceStream] Change-Id: I223428ffb39e883518aad817227f32851ea18aec --- graphics/java/android/graphics/drawable/Drawable.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'graphics/java/android') diff --git a/graphics/java/android/graphics/drawable/Drawable.java b/graphics/java/android/graphics/drawable/Drawable.java index 540acfa6a2e0..4bc5a5a6a38c 100644 --- a/graphics/java/android/graphics/drawable/Drawable.java +++ b/graphics/java/android/graphics/drawable/Drawable.java @@ -778,7 +778,8 @@ public abstract class Drawable { // to the compatibility density only to have them scaled back up when // drawn to the screen. if (opts == null) opts = new BitmapFactory.Options(); - opts.inScreenDensity = res.getDisplayMetrics().noncompatDensityDpi; + opts.inScreenDensity = res != null + ? res.getDisplayMetrics().noncompatDensityDpi : DisplayMetrics.DENSITY_DEVICE; Bitmap bm = BitmapFactory.decodeResourceStream(res, value, is, pad, opts); if (bm != null) { byte[] np = bm.getNinePatchChunk(); -- cgit v1.2.3-59-g8ed1b