summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaibo Huang <hhb@google.com>2020-03-16 18:26:47 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-03-16 18:26:47 +0000
commitd1d4a294fe8c207a22ee8ac5341f631aa6bf401b (patch)
tree819093cfc6a4ec836cff299572ca8cc4b7bf5e6a
parent82be09347322b4b5cd065eeb95a55ae259f83a12 (diff)
parent22ed29d6d7c026e86dde25fb3a3120c142fdeefb (diff)
downloadnoto-fonts-d1d4a294fe8c207a22ee8ac5341f631aa6bf401b.tar.gz
Merge "Fix the API for new flatbuffer"
-rw-r--r--emoji-compat/src/java/androidx/text/emoji/flatbuffer/MetadataItem.java6
-rw-r--r--emoji-compat/src/java/androidx/text/emoji/flatbuffer/MetadataList.java6
2 files changed, 6 insertions, 6 deletions
diff --git a/emoji-compat/src/java/androidx/text/emoji/flatbuffer/MetadataItem.java b/emoji-compat/src/java/androidx/text/emoji/flatbuffer/MetadataItem.java
index 49a1e2b..eec1339 100644
--- a/emoji-compat/src/java/androidx/text/emoji/flatbuffer/MetadataItem.java
+++ b/emoji-compat/src/java/androidx/text/emoji/flatbuffer/MetadataItem.java
@@ -99,7 +99,7 @@ public final class MetadataItem extends Table {
short width,
short height,
int codepointsOffset) {
- builder.startObject(7);
+ builder.startTable(7);
MetadataItem.addCodepoints(builder, codepointsOffset);
MetadataItem.addId(builder, id);
MetadataItem.addHeight(builder, height);
@@ -111,7 +111,7 @@ public final class MetadataItem extends Table {
}
public static void startMetadataItem(FlatBufferBuilder builder) {
- builder.startObject(7);
+ builder.startTable(7);
}
public static void addId(FlatBufferBuilder builder, int id) {
@@ -153,7 +153,7 @@ public final class MetadataItem extends Table {
}
public static int endMetadataItem(FlatBufferBuilder builder) {
- int o = builder.endObject();
+ int o = builder.endTable();
return o;
}
}
diff --git a/emoji-compat/src/java/androidx/text/emoji/flatbuffer/MetadataList.java b/emoji-compat/src/java/androidx/text/emoji/flatbuffer/MetadataList.java
index 97b12a4..1851401 100644
--- a/emoji-compat/src/java/androidx/text/emoji/flatbuffer/MetadataList.java
+++ b/emoji-compat/src/java/androidx/text/emoji/flatbuffer/MetadataList.java
@@ -79,7 +79,7 @@ public final class MetadataList extends Table {
int version,
int listOffset,
int sourceShaOffset) {
- builder.startObject(3);
+ builder.startTable(3);
MetadataList.addSourceSha(builder, sourceShaOffset);
MetadataList.addList(builder, listOffset);
MetadataList.addVersion(builder, version);
@@ -87,7 +87,7 @@ public final class MetadataList extends Table {
}
public static void startMetadataList(FlatBufferBuilder builder) {
- builder.startObject(3);
+ builder.startTable(3);
}
public static void addVersion(FlatBufferBuilder builder, int version) {
@@ -113,7 +113,7 @@ public final class MetadataList extends Table {
}
public static int endMetadataList(FlatBufferBuilder builder) {
- int o = builder.endObject();
+ int o = builder.endTable();
return o;
}