Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update framework from jetpack." into sc-dev

Browse Source
This commit is contained in:
Alexander Dorokhine
2021-04-01 04:33:36 +00:00
committed by Android (Google) Code Review
parent e3f114e779 eea1716148
commit 2acbf30842
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apex/appsearch/service/java/com/android/server/appsearch/external/localstorage/AppSearchImpl.java vendored
View File

@@ -412,11 +412,6 @@ public final class AppSearchImpl implements Closeable {
String prefix = createPrefix(packageName, databaseName); String prefix = createPrefix(packageName, databaseName);
GetSchemaResponse.Builder responseBuilder = new GetSchemaResponse.Builder(); GetSchemaResponse.Builder responseBuilder = new GetSchemaResponse.Builder();
if (!fullSchema.getTypesList().isEmpty()) {
// TODO(b/183050495) find a place to store the version for the database, rather
// than read from a schema.
responseBuilder.setVersion(fullSchema.getTypes(0).getVersion());
}
for (int i = 0; i < fullSchema.getTypesCount(); i++) { for (int i = 0; i < fullSchema.getTypesCount(); i++) {
String typePrefix = getPrefix(fullSchema.getTypes(i).getSchemaType()); String typePrefix = getPrefix(fullSchema.getTypes(i).getSchemaType());
if (!prefix.equals(typePrefix)) { if (!prefix.equals(typePrefix)) {
@@ -444,6 +439,10 @@ public final class AppSearchImpl implements Closeable {
AppSearchSchema schema = AppSearchSchema schema =
SchemaToProtoConverter.toAppSearchSchema(typeConfigBuilder); SchemaToProtoConverter.toAppSearchSchema(typeConfigBuilder);
// TODO(b/183050495) find a place to store the version for the database, rather
// than read from a schema.
responseBuilder.setVersion(fullSchema.getTypes(i).getVersion());
responseBuilder.addSchema(schema); responseBuilder.addSchema(schema);
} }
return responseBuilder.build(); return responseBuilder.build();

2
apex/appsearch/synced_jetpack_changeid.txt
View File

@@ -1 +1 @@
Ie11a0555775a0ab2a39f6ce6d0d8a7b735c416ce Ibbd3a92ad091f6911de652e2ba7e44f555a70a72