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

Commit d5d6561f authored by Seigo Nonaka's avatar Seigo Nonaka
Browse files

Need to return false if addSkTypeface fails. 

Bug: 36809770
Test: android.content.res.cts.ResourcesTest#testGetFont_invalidFontFiles
Change-Id: I89438805b9232b1f789af5f70ef1f773589ecd3a
parent be436bde

core/jni/android/graphics/FontFamily.cpp

+1 −2
Original line number Diff line number Diff line
@@ -245,8 +245,7 @@ static jboolean FontFamily_addFontFromAssetManager(JNIEnv* env, jobject, jlong b 
    }



    sk_sp<SkData> data(SkData::MakeWithProc(buf, asset->getLength(), releaseAsset, asset));

    addSkTypeface(builder, std::move(data), ttcIndex, weight, isItalic);

    return true;

    return addSkTypeface(builder, std::move(data), ttcIndex, weight, isItalic);

}



static void FontFamily_addAxisValue(jlong builderPtr, jint tag, jfloat value) {