commit 486f71253fd8dce3156f36f0007c81b4315405a3
author Aurimas Liutikas <aurimas@google.com> Mon Mar 16 21:10:48 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 16 21:10:48 2020 +0000
tree 2b1c786c53582c6efad3ac049b4dc49a056191aa
parent d1d4a294fe8c207a22ee8ac5341f631aa6bf401b
parent 55af922ecb2417556b7b0daf019c8f6f81021910

Merge "Revert "Fix the API for new flatbuffer""

emoji-compat/src/java/androidx/text/emoji/flatbuffer/MetadataItem.java

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 eec1339..49a1e2b 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 @@
             short width,
             short height,
             int codepointsOffset) {
-        builder.startTable(7);
+        builder.startObject(7);
         MetadataItem.addCodepoints(builder, codepointsOffset);
         MetadataItem.addId(builder, id);
         MetadataItem.addHeight(builder, height);
@@ -111,7 +111,7 @@
     }
 
     public static void startMetadataItem(FlatBufferBuilder builder) {
-        builder.startTable(7);
+        builder.startObject(7);
     }
 
     public static void addId(FlatBufferBuilder builder, int id) {
@@ -153,7 +153,7 @@
     }
 
     public static int endMetadataItem(FlatBufferBuilder builder) {
-        int o = builder.endTable();
+        int o = builder.endObject();
         return o;
     }
 }

emoji-compat/src/java/androidx/text/emoji/flatbuffer/MetadataList.java

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 1851401..97b12a4 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 @@
             int version,
             int listOffset,
             int sourceShaOffset) {
-        builder.startTable(3);
+        builder.startObject(3);
         MetadataList.addSourceSha(builder, sourceShaOffset);
         MetadataList.addList(builder, listOffset);
         MetadataList.addVersion(builder, version);
@@ -87,7 +87,7 @@
     }
 
     public static void startMetadataList(FlatBufferBuilder builder) {
-        builder.startTable(3);
+        builder.startObject(3);
     }
 
     public static void addVersion(FlatBufferBuilder builder, int version) {
@@ -113,7 +113,7 @@
     }
 
     public static int endMetadataList(FlatBufferBuilder builder) {
-        int o = builder.endTable();
+        int o = builder.endObject();
         return o;
     }