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

Commit 10c6d8b6 authored by sergeyv's avatar sergeyv Committed by android-build-merger
Browse files

Merge "Merge "Throw if BitmapFactory.Options.inBitmap is HARDWARE" into... 

Merge "Merge "Throw if BitmapFactory.Options.inBitmap is HARDWARE" into oc-mr1-dev am: cebe4326" into oc-mr1-dev-plus-aosp
am: 7a9b7da0

Change-Id: If0cad94709d037fd47a96870d7b4f56622e9131a
parents 6d71e136 7a9b7da0

graphics/java/android/graphics/BitmapFactory.java

+6 −1
Original line number Diff line number Diff line
@@ -433,10 +433,15 @@ public class BitmapFactory { 
        static void validate(Options opts) {

            if (opts == null) return;



            if (opts.inMutable && opts.inPreferredConfig == Bitmap.Config.HARDWARE) {

            if (opts.inBitmap != null && opts.inBitmap.getConfig() == Bitmap.Config.HARDWARE) {

                throw new IllegalArgumentException("Bitmaps with Config.HARWARE are always immutable");

            }



            if (opts.inMutable && opts.inPreferredConfig == Bitmap.Config.HARDWARE) {

                throw new IllegalArgumentException("Bitmaps with Config.HARDWARE cannot be " +

                        "decoded into - they are immutable");

            }



            if (opts.inPreferredColorSpace != null) {

                if (!(opts.inPreferredColorSpace instanceof ColorSpace.Rgb)) {

                    throw new IllegalArgumentException("The destination color space must use the " +