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

Commit 357f4472 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix spelling of "HARDWARE"" am: 9fbe4817 am: 281664ab am: 5ff66466"

parents 1fba2a62 13f86506

core/jni/android/graphics/BitmapFactory.cpp

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ static jobject doDecode(JNIEnv* env, std::unique_ptr<SkStreamRewindable> stream, 
    }



    if (isMutable && isHardware) {

        doThrowIAE(env, "Bitmaps with Config.HARWARE are always immutable");

        doThrowIAE(env, "Bitmaps with Config.HARDWARE are always immutable");

        return nullObjectReturn("Cannot create mutable hardware bitmap");

    }

graphics/java/android/graphics/BitmapFactory.java

+2 −1
Original line number Diff line number Diff line
@@ -440,7 +440,8 @@ public class BitmapFactory { 
            if (opts == null) return;



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

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

                throw new IllegalArgumentException(

                        "Bitmaps with Config.HARDWARE are always immutable");

            }



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