From eea171614859ab9ed79c8bba24840084ffd5d43e Mon Sep 17 00:00:00 2001
From: Alexander Dorokhine <adorokhine@google.com>
Date: Wed, 31 Mar 2021 16:48:18 -0700
Subject: [PATCH] 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
---
 .../appsearch/external/localstorage/AppSearchImpl.java   | 9 ++++-----
 apex/appsearch/synced_jetpack_changeid.txt               | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/apex/appsearch/service/java/com/android/server/appsearch/external/localstorage/AppSearchImpl.java b/apex/appsearch/service/java/com/android/server/appsearch/external/localstorage/AppSearchImpl.java
index de9d609ea17bb..5b43ac3874539 100644
--- a/apex/appsearch/service/java/com/android/server/appsearch/external/localstorage/AppSearchImpl.java
+++ b/apex/appsearch/service/java/com/android/server/appsearch/external/localstorage/AppSearchImpl.java
@@ -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();
diff --git a/apex/appsearch/synced_jetpack_changeid.txt b/apex/appsearch/synced_jetpack_changeid.txt
index 58f430b5bd615..29bd54134a370 100644
--- a/apex/appsearch/synced_jetpack_changeid.txt
+++ b/apex/appsearch/synced_jetpack_changeid.txt
@@ -1 +1 @@
-Ie11a0555775a0ab2a39f6ce6d0d8a7b735c416ce
+Ibbd3a92ad091f6911de652e2ba7e44f555a70a72