Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a566a6e authored by Alexander Dorokhine's avatar Alexander Dorokhine Committed by Automerger Merge Worker
Browse files

Merge "Update framework from jetpack." into sc-dev am: 2acbf308 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14058265

Change-Id: I02ef56dde4b92587363712511e2853e35efc590e
parents 49e98eb5 2acbf308

apex/appsearch/service/java/com/android/server/appsearch/external/localstorage/AppSearchImpl.java

+4 −5
Original line number Diff line number Diff line
@@ -412,11 +412,6 @@ public final class AppSearchImpl implements Closeable { 


            String prefix = createPrefix(packageName, databaseName);

            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++) {

                String typePrefix = getPrefix(fullSchema.getTypes(i).getSchemaType());

                if (!prefix.equals(typePrefix)) {
@@ -444,6 +439,10 @@ public final class AppSearchImpl implements Closeable { 


                AppSearchSchema schema =

                        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);

            }

            return responseBuilder.build();

apex/appsearch/synced_jetpack_changeid.txt

+1 −1
Original line number Diff line number Diff line 
Ie11a0555775a0ab2a39f6ce6d0d8a7b735c416ce
 
Ibbd3a92ad091f6911de652e2ba7e44f555a70a72