Temp. solution of realm/realm-java#3651

src/object_store.cpp

@@ -50,21 +50,26 @@ const size_t c_zeroRowIndex = 0;
 const char c_object_table_prefix[] = "class_";
 
 void create_metadata_tables(Group& group) {
-    TableRef table = group.get_or_add_table(c_primaryKeyTableName);
-    if (table->get_column_count() == 0) {
-        table->add_column(type_String, c_primaryKeyObjectClassColumnName);
-        table->add_column(type_String, c_primaryKeyPropertyNameColumnName);
-    }
-    table->add_search_index(table->get_column_index(c_primaryKeyObjectClassColumnName));
-
-    table = group.get_or_add_table(c_metadataTableName);
+    // FIXME: the order of the creation of the two tables seems to
+    // matter for some Android devices. The reason is unclear, and
+    // further investigation is required.
+    // See https://github.com/realm/realm-java/issues/3651
+
+    TableRef table = group.get_or_add_table(c_metadataTableName);
     if (table->get_column_count() == 0) {
         table->add_column(type_Int, c_versionColumnName);
 
         // set initial version
         table->add_empty_row();
         table->set_int(c_versionColumnIndex, c_zeroRowIndex, ObjectStore::NotVersioned);
     }
+
+    table = group.get_or_add_table(c_primaryKeyTableName);
+    if (table->get_column_count() == 0) {
+        table->add_column(type_String, c_primaryKeyObjectClassColumnName);
+        table->add_column(type_String, c_primaryKeyPropertyNameColumnName);
+    }
+    table->add_search_index(table->get_column_index(c_primaryKeyObjectClassColumnName));
 }
 
 void set_schema_version(Group& group, uint64_t version) {