Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexander Dorokhine
2021-02-23 20:25:03 +00:00
committed by Android (Google) Code Review
parent 736cf72fd3 67ebdec552
commit c13d22555f
4 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apex/appsearch/framework/api/current.txt
View File

@@ -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 {

1
apex/appsearch/framework/java/android/app/appsearch/AppSearchBatchResult.java
View File

@@ -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() {

1
apex/appsearch/framework/java/android/app/appsearch/AppSearchSession.java
View File

@@ -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,

6
apex/appsearch/framework/java/external/android/app/appsearch/SetSchemaResponse.java vendored
View File

@@ -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}.
*