Merge "Fix FontFamily nAddFontWeightStyle in nyc" into nyc-dev

This commit is contained in:
Diego Perez
2016-02-24 11:50:22 +00:00
committed by Android (Google) Code Review

View File

@@ -284,9 +284,9 @@ public class FontFamily_Delegate {
}
@LayoutlibDelegate
/*package*/ static boolean nAddFontWeightStyle(long nativeFamily,
ByteBuffer buffer, final List<FontListParser.Axis> axes,
final int weight, final boolean isItalic) {
/*package*/ static boolean nAddFontWeightStyle(long nativeFamily, ByteBuffer font,
int ttcIndex, List<FontListParser.Axis> listOfAxis,
int weight, boolean isItalic) {
assert false : "The only client of this method has been overriden.";
return false;
}