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

Commit 7ef7398d 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

Change-Id: I25fa1e54a66c3f84dab8f50914fe3da6f368e19e
parents c5cedc7b 46f847fb

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