From 05c66cc5cc6357be19fdef0fc131731368c38646 Mon Sep 17 00:00:00 2001 From: Jack Palevich Date: Mon, 4 Jun 2012 16:15:47 +0800 Subject: Don't crash when scaling Bitmaps with private Bitmap.Configs Bug: 6526197 Change-Id: I89f008f90888f0a679274c00293342ab0fb0e28e --- media/java/android/media/RemoteControlClient.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/media/java/android/media/RemoteControlClient.java b/media/java/android/media/RemoteControlClient.java index 18b4ee6..f1c4d34 100644 --- a/media/java/android/media/RemoteControlClient.java +++ b/media/java/android/media/RemoteControlClient.java @@ -854,7 +854,11 @@ public class RemoteControlClient float scale = Math.min((float) maxWidth / width, (float) maxHeight / height); int newWidth = Math.round(scale * width); int newHeight = Math.round(scale * height); - Bitmap outBitmap = Bitmap.createBitmap(newWidth, newHeight, bitmap.getConfig()); + Bitmap.Config newConfig = bitmap.getConfig(); + if (newConfig == null) { + newConfig = Bitmap.Config.ARGB_8888; + } + Bitmap outBitmap = Bitmap.createBitmap(newWidth, newHeight, newConfig); Canvas canvas = new Canvas(outBitmap); Paint paint = new Paint(); paint.setAntiAlias(true); -- cgit v1.1