Don't convert 4444 images to 565.

Bug #3327175

Change-Id: I46d970e41947278f4c2476b347fd2403fe9a05e8

diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java
index 2b4a410..a773007 100644 (file)
--- a/graphics/java/android/graphics/Bitmap.java
+++ b/graphics/java/android/graphics/Bitmap.java
@@ -464,8 +464,8 @@ public final class Bitmap implements Parcelable {
         Rect srcR = new Rect(x, y, x + width, y + height);
         RectF dstR = new RectF(0, 0, width, height);
 
-        final Config newConfig = source.getConfig() == Config.ARGB_8888 ?
-                Config.ARGB_8888 : Config.RGB_565;
+        final Config newConfig = source.getConfig() == Config.ARGB_8888 ||
+                source.getConfig() == Config.ARGB_4444 ? Config.ARGB_8888 : Config.RGB_565;
 
         if (m == null || m.isIdentity()) {
             bitmap = createBitmap(neww, newh, newConfig, source.hasAlpha());