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

Commit 7a9b7da0 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
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
parents 4df0b159 d82a46fd

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 " +