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

Commit 8c94a8f2 authored by Mathieu Chartier's avatar Mathieu Chartier Committed by Android (Google) Code Review
Browse files

Merge "Add missing null check to ninePatchInsets" into lmp-dev

parents 58703e65 a08d10fa

core/jni/android/graphics/BitmapFactory.cpp

+3 −0
Original line number Diff line number Diff line
@@ -367,6 +367,9 @@ static jobject doDecode(JNIEnv* env, SkStreamRewindable* stream, jobject padding 
                peeker.mOpticalInsets[0], peeker.mOpticalInsets[1], peeker.mOpticalInsets[2], peeker.mOpticalInsets[3],

                peeker.mOutlineInsets[0], peeker.mOutlineInsets[1], peeker.mOutlineInsets[2], peeker.mOutlineInsets[3],

                peeker.mOutlineRadius, peeker.mOutlineAlpha, scale);

        if (ninePatchInsets == NULL) {

            return nullObjectReturn("nine patch insets == null");

        }

        if (javaBitmap != NULL) {

            env->SetObjectField(javaBitmap, gBitmap_ninePatchInsetsFieldID, ninePatchInsets);

        }

core/jni/android/graphics/Graphics.cpp

+1 −0
Original line number Diff line number Diff line
@@ -419,6 +419,7 @@ jobject GraphicsJNI::createBitmap(JNIEnv* env, SkBitmap* bitmap, jbyteArray buff 
{

    SkASSERT(bitmap);

    SkASSERT(bitmap->pixelRef());

    SkASSERT(!env->ExceptionCheck());

    bool isMutable = bitmapCreateFlags & kBitmapCreateFlag_Mutable;

    bool isPremultiplied = bitmapCreateFlags & kBitmapCreateFlag_Premultiplied;