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

Commit 46f847fb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Need to return false if addSkTypeface fails." into oc-dev

parents ba2e284a d5d6561f

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) {