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

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

Unhide AppSearchSession APIs. 

Bug: 172180369
CTS-Coverage-Bug: 175661706
Test: AppSearchCtsTests
Change-Id: Ia00206ec4bbe78cc0c970fb2f0c708740a3078af
parent 779b7ceb

apex/appsearch/framework/api/current.txt

+20 −0
Original line number Diff line number Diff line
@@ -66,6 +66,21 @@ package android.app.appsearch { 
    method @NonNull public android.app.appsearch.AppSearchSchema.PropertyConfig.Builder setTokenizerType(int);

  }



  public final class AppSearchSession {

    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 setSchema(@NonNull android.app.appsearch.SetSchemaRequest, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.app.appsearch.AppSearchResult<java.lang.Void>>);

  }



  public interface BatchResultCallback<KeyType, ValueType> {

    method public void onResult(@NonNull android.app.appsearch.AppSearchBatchResult<KeyType,ValueType>);

    method public default void onSystemError(@Nullable Throwable);

  }



  public class GenericDocument {

    ctor protected GenericDocument(@NonNull android.app.appsearch.GenericDocument);

    method public long getCreationTimestampMillis();
@@ -162,6 +177,11 @@ package android.app.appsearch { 
    method public int getStart();

  }



  public class SearchResults implements java.io.Closeable {

    method public void close();

    method public void getNextPage(@NonNull java.util.function.Consumer<android.app.appsearch.AppSearchResult<java.util.List<android.app.appsearch.SearchResult>>>);

  }



  public final class SearchSpec {

    method public int getMaxSnippetSize();

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

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

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import java.util.function.Consumer; 
 * placed and queried.

 *

 * This class is thread safe.

 * @hide

 */

public final class AppSearchSession {

    private final String mDatabaseName;

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

+5 −4
Original line number Diff line number Diff line
@@ -16,13 +16,15 @@ 


package android.app.appsearch;



import android.annotation.NonNull;

import android.annotation.Nullable;



/**

 * The callback interface to return {@link AppSearchBatchResult}.

 *

 * @param <KeyType> The type of the keys for {@link AppSearchBatchResult#getSuccesses} and

 * {@link AppSearchBatchResult#getFailures}.

 * @param <ValueType> The type of result objects associated with the keys.

 * @hide

 */

public interface BatchResultCallback<KeyType, ValueType> {
@@ -31,15 +33,14 @@ public interface BatchResultCallback<KeyType, ValueType> { 
     *

     * @param result The result of the executed request.

     */

    void onResult(AppSearchBatchResult<KeyType, ValueType> result);



    void onResult(@NonNull AppSearchBatchResult<KeyType, ValueType> result);



    /**

     * Called when a system error occurred.

     *

     * @param throwable The cause throwable.

     */

    default void onSystemError(Throwable throwable) {

    default void onSystemError(@Nullable Throwable throwable) {

        if (throwable != null) {

            throw new RuntimeException(throwable);

        }

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

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import java.util.function.Consumer; 
 * <p>Should close this object after finish fetching results.

 *

 * <p>This class is not thread safe.

 * @hide

 */

public class SearchResults implements Closeable {

    private static final String TAG = "SearchResults";