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

Commit 46539bb6 authored by Alexander Dorokhine's avatar Alexander Dorokhine Committed by Automerger Merge Worker
Browse files

Merge "API updates to match API council recommendations." into sc-dev am: c13d2255 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5180aeb109e4bb1c7cc02fae6212ec9a6099e321
parents b994637d c13d2255

apex/appsearch/framework/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
package android.app.appsearch {



  public final class AppSearchBatchResult<KeyType, ValueType> {

    method @NonNull public java.util.Map<KeyType,android.app.appsearch.AppSearchResult<ValueType>> getAll();

    method @NonNull public java.util.Map<KeyType,android.app.appsearch.AppSearchResult<ValueType>> getFailures();

    method @NonNull public java.util.Map<KeyType,ValueType> getSuccesses();

    method public boolean isSuccess();
@@ -146,7 +147,7 @@ package android.app.appsearch { 
    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 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>>);

  }
@@ -358,7 +359,6 @@ package android.app.appsearch { 
    method @NonNull public java.util.Set<java.lang.String> getIncompatibleTypes();

    method @NonNull public java.util.Set<java.lang.String> getMigratedTypes();

    method @NonNull public java.util.List<android.app.appsearch.SetSchemaResponse.MigrationFailure> getMigrationFailures();

    method public boolean isSuccess();

  }



  public static class SetSchemaResponse.MigrationFailure {

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

+0 −1
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ public final class AppSearchBatchResult<KeyType, ValueType> implements Parcelabl 
     * Returns a {@link Map} of all keys mapped to the {@link AppSearchResult}s they produced.

     *

     * <p>The values of the {@link Map} will not be {@code null}.

     * @hide

     */

    @NonNull

    public Map<KeyType, AppSearchResult<ValueType>> getAll() {

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

+0 −1
Original line number Diff line number Diff line
@@ -497,7 +497,6 @@ public final class AppSearchSession implements Closeable { 
     * @param callback Callback to receive errors. If the operation succeeds, the callback will be

     *                 invoked with {@code null}.

     */

    @NonNull

    public void reportUsage(

            @NonNull ReportUsageRequest request,

            @NonNull @CallbackExecutor Executor executor,

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

+0 −6
Original line number Diff line number Diff line
@@ -79,12 +79,6 @@ public class SetSchemaResponse { 
        return mBundle;

    }



    /** TODO(b/177266929): Remove this deprecated method */

    //@Deprecated

    public boolean isSuccess() {

        return true;

    }



    /**

     * Returns a {@link List} of all failed {@link MigrationFailure}.

     *