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

Commit 186f01d0 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7306623 from a80a2548 to sc-release 

Change-Id: If23e317b3cffce94ce85e8c7846b7860a94738de
parents 6ebaa2f0 a80a2548

StubLibraries.bp

+0 −1
Original line number Diff line number Diff line
@@ -404,7 +404,6 @@ java_library_static { 


java_defaults {

    name: "android_defaults_stubs_current",

    static_libs: ["art-notices-for-framework-stubs-jar"], // License notices from art module

    sdk_version: "none",

    system_modules: "none",

    java_version: "1.8",

apct-tests/perftests/core/src/android/graphics/perftests/TypefaceCreatePerfTest.java

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ import java.io.OutputStream; 
@RunWith(AndroidJUnit4.class)

public class TypefaceCreatePerfTest {

    // A font file name in asset directory.

    private static final String TEST_FONT_NAME = "DancingScript.ttf";

    private static final String TEST_FONT_NAME = "DancingScript-Regular.ttf";



    @Rule

    public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();

apex/appsearch/framework/api/current.txt

+32 −44
Original line number Diff line number Diff line
@@ -79,15 +79,14 @@ package android.app.appsearch { 


  public static final class AppSearchSchema.DocumentPropertyConfig extends android.app.appsearch.AppSearchSchema.PropertyConfig {

    method @NonNull public String getSchemaType();

    method public boolean isIndexNestedProperties();

    method public boolean shouldIndexNestedProperties();

  }



  public static final class AppSearchSchema.DocumentPropertyConfig.Builder {

    ctor public AppSearchSchema.DocumentPropertyConfig.Builder(@NonNull String);

    ctor public AppSearchSchema.DocumentPropertyConfig.Builder(@NonNull String, @NonNull String);

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

    method @NonNull public android.app.appsearch.AppSearchSchema.DocumentPropertyConfig.Builder setCardinality(int);

    method @NonNull public android.app.appsearch.AppSearchSchema.DocumentPropertyConfig.Builder setIndexNestedProperties(boolean);

    method @NonNull public android.app.appsearch.AppSearchSchema.DocumentPropertyConfig.Builder setSchemaType(@NonNull String);

    method @NonNull public android.app.appsearch.AppSearchSchema.DocumentPropertyConfig.Builder setShouldIndexNestedProperties(boolean);

  }



  public static final class AppSearchSchema.DoublePropertyConfig extends android.app.appsearch.AppSearchSchema.PropertyConfig {
@@ -136,12 +135,12 @@ package android.app.appsearch { 


  public final class AppSearchSession implements java.io.Closeable {

    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 getByDocumentId(@NonNull android.app.appsearch.GetByDocumentIdRequest, @NonNull java.util.concurrent.Executor, @NonNull android.app.appsearch.BatchResultCallback<java.lang.String,android.app.appsearch.GenericDocument>);

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

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

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

    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 android.app.appsearch.RemoveByDocumentIdRequest, @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 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);
@@ -156,6 +155,7 @@ package android.app.appsearch { 
  public class GenericDocument {

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

    method public long getCreationTimestampMillis();

    method @NonNull public String getId();

    method public static int getMaxIndexedProperties();

    method @NonNull public String getNamespace();

    method @Nullable public Object getProperty(@NonNull String);
@@ -175,7 +175,6 @@ package android.app.appsearch { 
    method @NonNull public String getSchemaType();

    method public int getScore();

    method public long getTtlMillis();

    method @NonNull public String getUri();

  }



  public static class GenericDocument.Builder<BuilderType extends android.app.appsearch.GenericDocument.Builder> {
@@ -192,19 +191,19 @@ package android.app.appsearch { 
    method @NonNull public BuilderType setTtlMillis(long);

  }



  public final class GetByUriRequest {

  public final class GetByDocumentIdRequest {

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

    method @NonNull public String getNamespace();

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

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

    field public static final String PROJECTION_SCHEMA_TYPE_WILDCARD = "*";

  }



  public static final class GetByUriRequest.Builder {

    ctor public GetByUriRequest.Builder(@NonNull String);

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

    method @NonNull public android.app.appsearch.GetByUriRequest.Builder addUris(@NonNull java.lang.String...);

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

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

  public static final class GetByDocumentIdRequest.Builder {

    ctor public GetByDocumentIdRequest.Builder(@NonNull String);

    method @NonNull public android.app.appsearch.GetByDocumentIdRequest.Builder addIds(@NonNull java.lang.String...);

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

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

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

  }



  public class GetSchemaResponse {
@@ -249,44 +248,42 @@ package android.app.appsearch { 
    method @NonNull public android.app.appsearch.PutDocumentsRequest build();

  }



  public final class RemoveByUriRequest {

  public final class RemoveByDocumentIdRequest {

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

    method @NonNull public String getNamespace();

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

  }



  public static final class RemoveByUriRequest.Builder {

    ctor public RemoveByUriRequest.Builder(@NonNull String);

    method @NonNull public android.app.appsearch.RemoveByUriRequest.Builder addUris(@NonNull java.lang.String...);

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

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

  public static final class RemoveByDocumentIdRequest.Builder {

    ctor public RemoveByDocumentIdRequest.Builder(@NonNull String);

    method @NonNull public android.app.appsearch.RemoveByDocumentIdRequest.Builder addIds(@NonNull java.lang.String...);

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

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

  }



  public final class ReportSystemUsageRequest {

    method @NonNull public String getDatabaseName();

    method @NonNull public String getDocumentId();

    method @NonNull public String getNamespace();

    method @NonNull public String getPackageName();

    method @NonNull public String getUri();

    method public long getUsageTimeMillis();

    method public long getUsageTimestampMillis();

  }



  public static final class ReportSystemUsageRequest.Builder {

    ctor public ReportSystemUsageRequest.Builder(@NonNull String, @NonNull String, @NonNull String);

    ctor public ReportSystemUsageRequest.Builder(@NonNull String, @NonNull String, @NonNull String, @NonNull String);

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

    method @NonNull public android.app.appsearch.ReportSystemUsageRequest.Builder setUri(@NonNull String);

    method @NonNull public android.app.appsearch.ReportSystemUsageRequest.Builder setUsageTimeMillis(long);

    method @NonNull public android.app.appsearch.ReportSystemUsageRequest.Builder setUsageTimestampMillis(long);

  }



  public final class ReportUsageRequest {

    method @NonNull public String getDocumentId();

    method @NonNull public String getNamespace();

    method @NonNull public String getUri();

    method public long getUsageTimeMillis();

    method public long getUsageTimestampMillis();

  }



  public static final class ReportUsageRequest.Builder {

    ctor public ReportUsageRequest.Builder(@NonNull String);

    ctor public ReportUsageRequest.Builder(@NonNull String, @NonNull String);

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

    method @NonNull public android.app.appsearch.ReportUsageRequest.Builder setUri(@NonNull String);

    method @NonNull public android.app.appsearch.ReportUsageRequest.Builder setUsageTimeMillis(long);

    method @NonNull public android.app.appsearch.ReportUsageRequest.Builder setUsageTimestampMillis(long);

  }



  public final class SearchResult {
@@ -315,10 +312,9 @@ package android.app.appsearch { 
  }



  public static final class SearchResult.MatchInfo.Builder {

    ctor public SearchResult.MatchInfo.Builder();

    ctor public SearchResult.MatchInfo.Builder(@NonNull String);

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

    method @NonNull public android.app.appsearch.SearchResult.MatchInfo.Builder setExactMatchRange(@NonNull android.app.appsearch.SearchResult.MatchRange);

    method @NonNull public android.app.appsearch.SearchResult.MatchInfo.Builder setPropertyPath(@NonNull String);

    method @NonNull public android.app.appsearch.SearchResult.MatchInfo.Builder setSnippetRange(@NonNull android.app.appsearch.SearchResult.MatchRange);

  }
@@ -427,19 +423,11 @@ package android.app.appsearch { 
  }



  public static class SetSchemaResponse.MigrationFailure {

    ctor public SetSchemaResponse.MigrationFailure(@NonNull String, @NonNull String, @NonNull String, @NonNull android.app.appsearch.AppSearchResult<?>);

    method @NonNull public android.app.appsearch.AppSearchResult<java.lang.Void> getAppSearchResult();

    method @NonNull public String getDocumentId();

    method @NonNull public String getNamespace();

    method @NonNull public String getSchemaType();

    method @NonNull public String getUri();

  }



  public static final class SetSchemaResponse.MigrationFailure.Builder {

    ctor public SetSchemaResponse.MigrationFailure.Builder();

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

    method @NonNull public android.app.appsearch.SetSchemaResponse.MigrationFailure.Builder setAppSearchResult(@NonNull android.app.appsearch.AppSearchResult<java.lang.Void>);

    method @NonNull public android.app.appsearch.SetSchemaResponse.MigrationFailure.Builder setNamespace(@NonNull String);

    method @NonNull public android.app.appsearch.SetSchemaResponse.MigrationFailure.Builder setSchemaType(@NonNull String);

    method @NonNull public android.app.appsearch.SetSchemaResponse.MigrationFailure.Builder setUri(@NonNull String);

  }



  public class StorageInfo {

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

+4 −3
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ import java.util.Objects; 
 * both successes and failures.

 *

 * @see AppSearchSession#put

 * @see AppSearchSession#getByUri

 * @see AppSearchSession#getByDocumentId

 * @see AppSearchSession#remove

 */

public final class AppSearchBatchResult<KeyType, ValueType> implements Parcelable {
@@ -87,8 +87,9 @@ public final class AppSearchBatchResult<KeyType, ValueType> implements Parcelabl 
     * Returns a {@link Map} of keys mapped to instances of the value type for all successful

     * individual results.

     *

     * <p>Example: {@link AppSearchSession#getByUri} returns an {@link AppSearchBatchResult}. Each

     * key (a URI of {@code String} type) will map to a {@link GenericDocument} object.

     * <p>Example: {@link AppSearchSession#getByDocumentId} returns an {@link AppSearchBatchResult}.

     * Each key (the document ID, of {@code String} type) will map to a {@link GenericDocument}

     * object.

     *

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

     */

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

+9 −10
Original line number Diff line number Diff line
@@ -78,10 +78,10 @@ import java.util.function.Consumer; 
 * });</pre>

 *

 * <p>The basic unit of data in AppSearch is represented as a {@link GenericDocument} object,

 * containing a URI, namespace, time-to-live, score, and properties. A namespace organizes a logical

 * containing an ID, namespace, time-to-live, score, and properties. A namespace organizes a logical

 * group of documents. For example, a namespace can be created to group documents on a per-account

 * basis. A URI identifies a single document within a namespace. The combination of URI and

 * namespace uniquely identifies a {@link GenericDocument} in the database.

 * basis. An ID identifies a single document within a namespace. The combination of namespace and ID

 * uniquely identifies a {@link GenericDocument} in the database.

 *

 * <p>Once the schema has been set, {@link GenericDocument} objects can be put into the database and

 * indexed by calling {@link AppSearchSession#put}.
@@ -91,8 +91,7 @@ import java.util.function.Consumer; 
 * <pre>

 * // Although for this example we use GenericDocument directly, we recommend extending

 * // GenericDocument to create specific types (i.e. Email) with specific setters/getters.

 * GenericDocument email = new GenericDocument.Builder<>(URI, EMAIL_SCHEMA_TYPE)

 *     .setNamespace(NAMESPACE)

 * GenericDocument email = new GenericDocument.Builder<>(NAMESPACE, ID, EMAIL_SCHEMA_TYPE)

 *     .setPropertyString(“subject”, EMAIL_SUBJECT)

 *     .setScore(EMAIL_SCORE)

 *     .build();
@@ -108,13 +107,13 @@ import java.util.function.Consumer; 
 * <p>Searching within the database is done by calling {@link AppSearchSession#search} and providing

 * the query string to search for, as well as a {@link SearchSpec}.

 *

 * <p>Alternatively, {@link AppSearchSession#getByUri} can be called to retrieve documents by URI

 * and namespace.

 * <p>Alternatively, {@link AppSearchSession#getByDocumentId} can be called to retrieve documents by

 * namespace and ID.

 *

 * <p>Document removal is done either by time-to-live expiration, or explicitly calling a remove

 * operation. Remove operations can be done by URI and namespace via {@link

 * AppSearchSession#remove(RemoveByUriRequest, Executor, BatchResultCallback)}, or by query via

 * {@link AppSearchSession#remove(String, SearchSpec, Executor, Consumer)}.

 * operation. Remove operations can be done by namespace and ID via {@link

 * AppSearchSession#remove(RemoveByDocumentIdRequest, Executor, BatchResultCallback)}, or by query

 * via {@link AppSearchSession#remove(String, SearchSpec, Executor, Consumer)}.

 */

@SystemService(Context.APP_SEARCH_SERVICE)

public class AppSearchManager {