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

Commit eea17161 authored by Alexander Dorokhine's avatar Alexander Dorokhine
Browse files

Update framework from jetpack. 

Included changes:
* 1be54dc: Minor fix for where we set version in schema.
* 5c8a15d: Clean up deprecated methods after dogfood transition.
* 53407e5: Upstream fixes to storage info tests.

Bug: 182620003
Bug: 182909475
Bug: 181887768
Bug: 183395357
Test: Presubmit
Change-Id: Ie918c6c337c3943bc56909dc09eb75287a275487
parent 1b53c7b5

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

+4 −5
Original line number Original line Diff line number Diff line
@@ -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();

apex/appsearch/synced_jetpack_changeid.txt

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