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

Commit 05410a28 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7354453 from 373c6933 to sc-release 

Change-Id: I0e7eb3d94be2004ac902e53f5f94b401e69fb828
parents e766d16a 373c6933

Android.bp

+15 −1
Original line number Diff line number Diff line
@@ -483,6 +483,19 @@ metalava_framework_docs_args = "--manifest $(location core/res/AndroidManifest.x 
    "--api-lint-ignore-prefix junit. " +

    "--api-lint-ignore-prefix org. "



packages_to_document = [

    "android",

    "dalvik",

    "java",

    "javax",

    "junit",

    "org.apache.http",

    "org.json",

    "org.w3c.dom",

    "org.xml.sax",

    "org.xmlpull",

]



filegroup {

    name: "android-non-updatable-stub-sources",

    srcs: [
@@ -535,7 +548,7 @@ stubs_defaults { 
        "android.hardware.usb.gadget-V1.0-java",

        "android.hardware.vibrator-V1.3-java",

        "framework-protos",

        "stable.core.platform.api.stubs",

        "art.module.public.api",

        // There are a few classes from modules used by the core that

        // need to be resolved by metalava. We use a prebuilt stub of the

        // full sdk to ensure we can resolve them. If a new class gets added,
@@ -544,6 +557,7 @@ stubs_defaults { 
        // NOTE: The below can be removed once the prebuilt stub contains IKE.

        "sdk_system_current_android.net.ipsec.ike",

    ],

    filter_packages: packages_to_document,

    high_mem: true, // Lots of sources => high memory use, see b/170701554

    installable: false,

    annotations_enabled: true,

ApiDocs.bp

+4 −3
Original line number Diff line number Diff line
@@ -93,13 +93,14 @@ stubs_defaults { 
        ":updatable-media-srcs",



        // No longer part of the stubs, but are included in the docs.

        "test-base/src/**/*.java",

        "test-mock/src/**/*.java",

        "test-runner/src/**/*.java",

        ":android-test-base-sources",

        ":android-test-mock-sources",

        ":android-test-runner-sources",

    ],

    libs: framework_docs_only_libs,

    create_doc_stubs: true,

    annotations_enabled: true,

    filter_packages: packages_to_document,

    api_levels_annotations_enabled: true,

    api_levels_annotations_dirs: [

        "sdk-dir",

StubLibraries.bp

+0 −14
Original line number Diff line number Diff line
@@ -27,24 +27,10 @@ 
// Common metalava configs

/////////////////////////////////////////////////////////////////////



packages_to_document = [

    "android",

    "dalvik",

    "java",

    "javax",

    "junit",

    "org.apache.http",

    "org.json",

    "org.w3c.dom",

    "org.xml.sax",

    "org.xmlpull",

]



stubs_defaults {

    name: "metalava-non-updatable-api-stubs-default",

    defaults: ["android-non-updatable-stubs-defaults"],

    api_levels_annotations_enabled: false,

    filter_packages: packages_to_document,

    defaults_visibility: ["//visibility:private"],

}

apex/appsearch/framework/api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -290,14 +290,12 @@ package android.app.appsearch { 
    method @NonNull public String getDatabaseName();

    method @NonNull public android.app.appsearch.GenericDocument getGenericDocument();

    method @NonNull public java.util.List<android.app.appsearch.SearchResult.MatchInfo> getMatchInfos();

    method @Deprecated @NonNull public java.util.List<android.app.appsearch.SearchResult.MatchInfo> getMatches();

    method @NonNull public String getPackageName();

    method public double getRankingSignal();

  }



  public static final class SearchResult.Builder {

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

    method @Deprecated @NonNull public android.app.appsearch.SearchResult.Builder addMatch(@NonNull android.app.appsearch.SearchResult.MatchInfo);

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

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

    method @NonNull public android.app.appsearch.SearchResult.Builder setGenericDocument(@NonNull android.app.appsearch.GenericDocument);

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

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.app.appsearch; 
import android.annotation.CallbackExecutor;

import android.annotation.NonNull;

import android.annotation.SystemService;

import android.app.appsearch.aidl.IAppSearchManager;

import android.content.Context;



import com.android.internal.util.Preconditions;