Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65710b4e authored by Romain Guy's avatar Romain Guy Committed by Android Git Automerger
Browse files

am bc71d625: Merge "Don\'t convert 4444 images to 565. Bug #3327175" into honeycomb 

* commit 'bc71d625':
  Don't convert 4444 images to 565. Bug #3327175
parents c0957f3c bc71d625

graphics/java/android/graphics/Bitmap.java

+2 −2
Original line number Diff line number Diff line
@@ -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());