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

Commit fdb544e3 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Update API txt following a metalava fix" into sc-dev am: 0d41eef5 

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

Change-Id: Ia50e9fcc76d65479b93d210659f65b2e68d07bc3
parents bf3d41c0 0d41eef5

apex/appsearch/framework/api/current.txt

+4 −4
Original line number Diff line number Diff line
@@ -370,13 +370,13 @@ package android.app.appsearch { 
    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.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 setMaxSnippetSize(@IntRange(from=0, to=0x2710) int);

    method @NonNull public android.app.appsearch.SearchSpec.Builder setOrder(int);

    method @NonNull public android.app.appsearch.SearchSpec.Builder setRankingStrategy(int);

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

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

    method @NonNull public android.app.appsearch.SearchSpec.Builder setResultGrouping(int, int);

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

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

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

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

    method @NonNull public android.app.appsearch.SearchSpec.Builder setTermMatch(int);

  }

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -27137,7 +27137,7 @@ package android.net.vcn { 
  public final class VcnGatewayConnectionConfig {

    method @NonNull public int[] getExposedCapabilities();

    method @NonNull public String getGatewayConnectionName();

    method @IntRange(from=android.net.vcn.VcnGatewayConnectionConfig.MIN_MTU_V6) public int getMaxMtu();

    method @IntRange(from=0x500) public int getMaxMtu();

    method @NonNull public long[] getRetryIntervalsMillis();

  }









@@ -27146,7 +27146,7 @@ package android.net.vcn {













    method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder addExposedCapability(int);















    method @NonNull public android.net.vcn.VcnGatewayConnectionConfig build();















    method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder removeExposedCapability(int);













    method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder setMaxMtu(@IntRange(from=android.net.vcn.VcnGatewayConnectionConfig.MIN_MTU_V6) int);













    method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder setMaxMtu(@IntRange(from=0x500) int);















    method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder setRetryIntervalsMillis(@NonNull long[]);















  }