Merge "Snap for 6348162 from 9ede389bb7ce39f7b0edcb7b095b5f5344b22617 to sdk-release" into sdk-releaseplatform-tools-30.0.1platform-tools-30.0.0

3 files changed, 8 insertions, 8 deletions

diff --git a/emoji-compat/build.gradle b/emoji-compat/build.gradle
index 34acb79..752eb39 100644
--- a/emoji-compat/build.gradle
+++ b/emoji-compat/build.gradle
@@ -48,12 +48,12 @@ compileJava {
 }
 
 dependencies {
-    compile 'com.google.flatbuffers:flatbuffers-java:1.8.0'
+    compile 'com.google.flatbuffers:flatbuffers-java:1.12.0'
 }
 
 jarjar.repackage('rename') {
     destinationName "noto-emoji-compat-java.jar"
-    from 'com.google.flatbuffers:flatbuffers-java:1.8.0'
+    from 'com.google.flatbuffers:flatbuffers-java:1.12.0'
     from files(sourceSets.main.output.classesDirs)
     dependsOn sourceSets.main.output
     classRename 'com.google.flatbuffers.**', 'androidx.text.emoji.flatbuffer.@1'
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;
     }