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

Commit 59964fcb authored by Alexander Dorokhine's avatar Alexander Dorokhine Committed by Automerger Merge Worker
Browse files

Merge "Update framework from Jetpack." into sc-dev am: bad7328c 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iffb1efd665bc720e30679bbc9aebc969ee9583cc
parents dc239cbb bad7328c

apex/appsearch/framework/api/current.txt

+16 −16
Original line number Diff line number Diff line
@@ -143,11 +143,11 @@ package android.app.appsearch { 
    method public void close();

    method public void getByUri(@NonNull android.app.appsearch.GetByUriRequest, @NonNull java.util.concurrent.Executor, @NonNull android.app.appsearch.BatchResultCallback<java.lang.String,android.app.appsearch.GenericDocument>);

    method public void getSchema(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.app.appsearch.AppSearchResult<java.util.Set<android.app.appsearch.AppSearchSchema>>>);

    method public void putDocuments(@NonNull android.app.appsearch.PutDocumentsRequest, @NonNull java.util.concurrent.Executor, @NonNull android.app.appsearch.BatchResultCallback<java.lang.String,java.lang.Void>);

    method @NonNull public android.app.appsearch.SearchResults query(@NonNull String, @NonNull android.app.appsearch.SearchSpec, @NonNull java.util.concurrent.Executor);

    method public void removeByQuery(@NonNull String, @NonNull android.app.appsearch.SearchSpec, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.app.appsearch.AppSearchResult<java.lang.Void>>);

    method public void removeByUri(@NonNull android.app.appsearch.RemoveByUriRequest, @NonNull java.util.concurrent.Executor, @NonNull android.app.appsearch.BatchResultCallback<java.lang.String,java.lang.Void>);

    method public void put(@NonNull android.app.appsearch.PutDocumentsRequest, @NonNull java.util.concurrent.Executor, @NonNull android.app.appsearch.BatchResultCallback<java.lang.String,java.lang.Void>);

    method public void remove(@NonNull android.app.appsearch.RemoveByUriRequest, @NonNull java.util.concurrent.Executor, @NonNull android.app.appsearch.BatchResultCallback<java.lang.String,java.lang.Void>);

    method public void remove(@NonNull String, @NonNull android.app.appsearch.SearchSpec, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.app.appsearch.AppSearchResult<java.lang.Void>>);

    method @NonNull public void reportUsage(@NonNull android.app.appsearch.ReportUsageRequest, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.app.appsearch.AppSearchResult<java.lang.Void>>);

    method @NonNull public android.app.appsearch.SearchResults search(@NonNull String, @NonNull android.app.appsearch.SearchSpec, @NonNull java.util.concurrent.Executor);

    method public void setSchema(@NonNull android.app.appsearch.SetSchemaRequest, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.app.appsearch.AppSearchResult<android.app.appsearch.SetSchemaResponse>>);

  }
@@ -216,7 +216,7 @@ package android.app.appsearch { 


  public class GlobalSearchSession implements java.io.Closeable {

    method public void close();

    method @NonNull public android.app.appsearch.SearchResults query(@NonNull String, @NonNull android.app.appsearch.SearchSpec, @NonNull java.util.concurrent.Executor);

    method @NonNull public android.app.appsearch.SearchResults search(@NonNull String, @NonNull android.app.appsearch.SearchSpec, @NonNull java.util.concurrent.Executor);

  }



  public class PackageIdentifier {
@@ -226,13 +226,13 @@ package android.app.appsearch { 
  }



  public final class PutDocumentsRequest {

    method @NonNull public java.util.List<android.app.appsearch.GenericDocument> getDocuments();

    method @NonNull public java.util.List<android.app.appsearch.GenericDocument> getGenericDocuments();

  }



  public static final class PutDocumentsRequest.Builder {

    ctor public PutDocumentsRequest.Builder();

    method @NonNull public android.app.appsearch.PutDocumentsRequest.Builder addGenericDocument(@NonNull android.app.appsearch.GenericDocument...);

    method @NonNull public android.app.appsearch.PutDocumentsRequest.Builder addGenericDocument(@NonNull java.util.Collection<? extends android.app.appsearch.GenericDocument>);

    method @NonNull public android.app.appsearch.PutDocumentsRequest.Builder addGenericDocuments(@NonNull android.app.appsearch.GenericDocument...);

    method @NonNull public android.app.appsearch.PutDocumentsRequest.Builder addGenericDocuments(@NonNull java.util.Collection<? extends android.app.appsearch.GenericDocument>);

    method @NonNull public android.app.appsearch.PutDocumentsRequest build();

  }
@@ -290,14 +290,14 @@ package android.app.appsearch { 
  }



  public final class SearchSpec {

    method @NonNull public java.util.List<java.lang.String> getFilterNamespaces();

    method @NonNull public java.util.List<java.lang.String> getFilterPackageNames();

    method @NonNull public java.util.List<java.lang.String> getFilterSchemas();

    method public int getMaxSnippetSize();

    method @NonNull public java.util.List<java.lang.String> getNamespaces();

    method public int getOrder();

    method @NonNull public java.util.Map<java.lang.String,java.util.List<java.lang.String>> getProjections();

    method public int getRankingStrategy();

    method public int getResultCountPerPage();

    method @NonNull public java.util.List<java.lang.String> getSchemaTypes();

    method public int getSnippetCount();

    method public int getSnippetCountPerProperty();

    method public int getTermMatch();
@@ -316,14 +316,14 @@ package android.app.appsearch { 


  public static final class SearchSpec.Builder {

    ctor public SearchSpec.Builder();

    method @NonNull public android.app.appsearch.SearchSpec.Builder addFilterNamespaces(@NonNull java.lang.String...);

    method @NonNull public android.app.appsearch.SearchSpec.Builder addFilterNamespaces(@NonNull java.util.Collection<java.lang.String>);

    method @NonNull public android.app.appsearch.SearchSpec.Builder addFilterPackageNames(@NonNull java.lang.String...);

    method @NonNull public android.app.appsearch.SearchSpec.Builder addFilterPackageNames(@NonNull java.util.Collection<java.lang.String>);

    method @NonNull public android.app.appsearch.SearchSpec.Builder addNamespace(@NonNull java.lang.String...);

    method @NonNull public android.app.appsearch.SearchSpec.Builder addNamespace(@NonNull java.util.Collection<java.lang.String>);

    method @NonNull public android.app.appsearch.SearchSpec.Builder addFilterSchemas(@NonNull java.lang.String...);

    method @NonNull public android.app.appsearch.SearchSpec.Builder addFilterSchemas(@NonNull java.util.Collection<java.lang.String>);

    method @NonNull public android.app.appsearch.SearchSpec.Builder addProjection(@NonNull String, @NonNull java.lang.String...);

    method @NonNull public android.app.appsearch.SearchSpec.Builder addProjection(@NonNull String, @NonNull java.util.Collection<java.lang.String>);

    method @NonNull public android.app.appsearch.SearchSpec.Builder addSchemaType(@NonNull java.lang.String...);

    method @NonNull public android.app.appsearch.SearchSpec.Builder addSchemaType(@NonNull java.util.Collection<java.lang.String>);

    method @NonNull public android.app.appsearch.SearchSpec build();

    method @NonNull public android.app.appsearch.SearchSpec.Builder setMaxSnippetSize(@IntRange(from=0, to=android.app.appsearch.SearchSpec.MAX_SNIPPET_SIZE_LIMIT) int);

    method @NonNull public android.app.appsearch.SearchSpec.Builder setOrder(int);
@@ -344,8 +344,8 @@ package android.app.appsearch { 


  public static final class SetSchemaRequest.Builder {

    ctor public SetSchemaRequest.Builder();

    method @NonNull public android.app.appsearch.SetSchemaRequest.Builder addSchema(@NonNull android.app.appsearch.AppSearchSchema...);

    method @NonNull public android.app.appsearch.SetSchemaRequest.Builder addSchema(@NonNull java.util.Collection<android.app.appsearch.AppSearchSchema>);

    method @NonNull public android.app.appsearch.SetSchemaRequest.Builder addSchemas(@NonNull android.app.appsearch.AppSearchSchema...);

    method @NonNull public android.app.appsearch.SetSchemaRequest.Builder addSchemas(@NonNull java.util.Collection<android.app.appsearch.AppSearchSchema>);

    method @NonNull public android.app.appsearch.SetSchemaRequest build();

    method @NonNull public android.app.appsearch.SetSchemaRequest.Builder setForceOverride(boolean);

    method @NonNull public android.app.appsearch.SetSchemaRequest.Builder setMigrator(@NonNull String, @NonNull android.app.appsearch.AppSearchSchema.Migrator);

apex/appsearch/framework/java/android/app/appsearch/AppSearchManager.java

+4 −4
Original line number Diff line number Diff line
@@ -270,12 +270,12 @@ public class AppSearchManager { 
     *     they were successfully indexed, or a failed {@link AppSearchResult} otherwise.

     * @throws RuntimeException If an error occurred during the execution.

     * @hide

     * @deprecated use {@link AppSearchSession#putDocuments} instead.

     * @deprecated use {@link AppSearchSession#put} instead.

     */

    public AppSearchBatchResult<String, Void> putDocuments(@NonNull PutDocumentsRequest request) {

        // TODO(b/146386470): Transmit these documents as a RemoteStream instead of sending them in

        // one big list.

        List<GenericDocument> documents = request.getDocuments();

        List<GenericDocument> documents = request.getGenericDocuments();

        List<Bundle> documentBundles = new ArrayList<>(documents.size());

        for (int i = 0; i < documents.size(); i++) {

            documentBundles.add(documents.get(i).getBundle());
@@ -330,7 +330,7 @@ public class AppSearchManager { 
                    DEFAULT_DATABASE_NAME,

                    request.getNamespace(),

                    uris,

                    request.getProjectionsVisibleToPackagesInternal(),

                    request.getProjectionsInternal(),

                    mContext.getUserId(),

                    new IAppSearchBatchResultCallback.Stub() {

                        public void onResult(AppSearchBatchResult result) {
@@ -465,7 +465,7 @@ public class AppSearchManager { 
     *     {@link AppSearchResult} with a result code of {@link AppSearchResult#RESULT_NOT_FOUND}.

     * @throws RuntimeException If an error occurred during the execution.

     * @hide

     * @deprecated use {@link AppSearchSession#removeByUri} instead.

     * @deprecated use {@link AppSearchSession#remove} instead.

     */

    public AppSearchBatchResult<String, Void> removeByUri(@NonNull RemoveByUriRequest request) {

        List<String> uris = new ArrayList<>(request.getUris());

apex/appsearch/framework/java/android/app/appsearch/AppSearchSession.java

+11 −9
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ public final class AppSearchSession implements Closeable { 
    }



    /**

     * Sets the schema that will be used by documents provided to the {@link #putDocuments} method.

     * Sets the schema that will be used by documents provided to the {@link #put} method.

     *

     * <p>The schema provided here is compared to the stored copy of the schema previously supplied

     * to {@link #setSchema}, if any, to determine how to treat existing documents. The following
@@ -268,7 +268,7 @@ public final class AppSearchSession implements Closeable { 
     *                 {@link Throwable} if an unexpected internal error occurred in AppSearch

     *                 service.

     */

    public void putDocuments(

    public void put(

            @NonNull PutDocumentsRequest request,

            @NonNull @CallbackExecutor Executor executor,

            @NonNull BatchResultCallback<String, Void> callback) {
@@ -276,7 +276,7 @@ public final class AppSearchSession implements Closeable { 
        Objects.requireNonNull(executor);

        Objects.requireNonNull(callback);

        Preconditions.checkState(!mIsClosed, "AppSearchSession has already been closed");

        List<GenericDocument> documents = request.getDocuments();

        List<GenericDocument> documents = request.getGenericDocuments();

        List<Bundle> documentBundles = new ArrayList<>(documents.size());

        for (int i = 0; i < documents.size(); i++) {

            documentBundles.add(documents.get(i).getBundle());
@@ -327,7 +327,7 @@ public final class AppSearchSession implements Closeable { 
                    mDatabaseName,

                    request.getNamespace(),

                    new ArrayList<>(request.getUris()),

                    request.getProjectionsVisibleToPackagesInternal(),

                    request.getProjectionsInternal(),

                    mUserId,

                    new IAppSearchBatchResultCallback.Stub() {

                        public void onResult(AppSearchBatchResult result) {
@@ -423,7 +423,7 @@ public final class AppSearchSession implements Closeable { 
     * @return The search result of performing this operation.

     */

    @NonNull

    public SearchResults query(

    public SearchResults search(

            @NonNull String queryExpression,

            @NonNull SearchSpec searchSpec,

            @NonNull @CallbackExecutor Executor executor) {
@@ -441,7 +441,7 @@ public final class AppSearchSession implements Closeable { 
     * <p>A usage report represents an event in which a user interacted with or viewed a document.

     *

     * <p>For each call to {@link #reportUsage}, AppSearch updates usage count and usage recency

     * metrics for that particular document. These metrics are used for ordering {@link #query}

     * metrics for that particular document. These metrics are used for ordering {@link #search}

     * results by the {@link SearchSpec#RANKING_STRATEGY_USAGE_COUNT} and

     * {@link SearchSpec#RANKING_STRATEGY_USAGE_LAST_USED_TIMESTAMP} ranking strategies.

     *
@@ -494,7 +494,7 @@ public final class AppSearchSession implements Closeable { 
     *                 {@link Throwable} if an unexpected internal error occurred in AppSearch

     *                 service.

     */

    public void removeByUri(

    public void remove(

            @NonNull RemoveByUriRequest request,

            @NonNull @CallbackExecutor Executor executor,

            @NonNull BatchResultCallback<String, Void> callback) {
@@ -523,7 +523,8 @@ public final class AppSearchSession implements Closeable { 
    /**

     * Removes {@link GenericDocument}s from the index by Query. Documents will be removed if they

     * match the {@code queryExpression} in given namespaces and schemaTypes which is set via

     * {@link SearchSpec.Builder#addNamespace} and {@link SearchSpec.Builder#addSchemaType}.

     * {@link SearchSpec.Builder#addFilterNamespaces} and

     * {@link SearchSpec.Builder#addFilterSchemas}.

     *

     * <p> An empty {@code queryExpression} matches all documents.

     *
@@ -539,7 +540,8 @@ public final class AppSearchSession implements Closeable { 
     *                        the operation succeeds, the callback will be invoked with

     *                        {@code null}.

     */

    public void removeByQuery(@NonNull String queryExpression,

    public void remove(

            @NonNull String queryExpression,

            @NonNull SearchSpec searchSpec,

            @NonNull @CallbackExecutor Executor executor,

            @NonNull Consumer<AppSearchResult<Void>> callback) {

apex/appsearch/framework/java/android/app/appsearch/GlobalSearchSession.java

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ public class GlobalSearchSession implements Closeable { 
     * @return The search result of performing this operation.

     */

    @NonNull

    public SearchResults query(

    public SearchResults search(

            @NonNull String queryExpression,

            @NonNull SearchSpec searchSpec,

            @NonNull @CallbackExecutor Executor executor) {

apex/appsearch/framework/java/external/android/app/appsearch/AppSearchSchema.java

+0 −4
Original line number Diff line number Diff line
@@ -141,10 +141,6 @@ public final class AppSearchSchema { 
        }



        /** Adds a property to the given type. */

        // TODO(b/171360120): MissingGetterMatchingBuilder expects a method called getPropertys, but

        //  we provide the (correct) method getProperties. Once the bug referenced in this TODO is

        //  fixed, remove this SuppressLint.

        @SuppressLint("MissingGetterMatchingBuilder")

        @NonNull

        public AppSearchSchema.Builder addProperty(@NonNull PropertyConfig propertyConfig) {

            Preconditions.checkState(!mBuilt, "Builder has already been used");