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

Commit c483838d authored by Seigo Nonaka's avatar Seigo Nonaka Committed by android-build-merger
Browse files

Merge "Need to return false if addSkTypeface fails." into oc-dev am: 46f847fb 

am: 7ef7398d

Change-Id: I8e472ef9948db82a123c1a84a7635e716f2df150
parents 65f1f8b3 7ef7398d

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