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

This commit is contained in:
TreeHugger Robot
2017-04-04 22:11:28 +00:00
committed by Android (Google) Code Review

View File

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