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

Commit 81d5ade2 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13460502 from d3ad2ab6 to 25Q3-release 

Change-Id: Iccee0be69491492290024bdc4561d9fd7e8767ed
parents 8fb4c57a d3ad2ab6

apct-tests/perftests/tracing/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
// limitations under the License.



android_test {

    name: "ProtologPerfTests",

    name: "UiTracingPerfTests",

    team: "trendy_team_windowing_tools",

    srcs: ["src/**/*.java"],

    static_libs: [

apct-tests/perftests/tracing/AndroidManifest.xml

+2 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
     limitations under the License.

-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.perftests.protolog">

    package="android.tracing.perftests">



    <!-- For perfetto trace files -->

    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
@@ -25,7 +25,6 @@ 
    </application>



    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"

        android:targetPackage="com.android.perftests.protolog">

        <!-- <meta-data android:name="listener" android:value="android.protolog.ProtologPerfRunListener" /> -->

        android:targetPackage="android.tracing.perftests">

    </instrumentation>

</manifest>

apct-tests/perftests/tracing/AndroidTest.xml

+3 −3
Original line number Diff line number Diff line
@@ -13,14 +13,14 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<configuration description="Runs ProtologPerfTests metric instrumentation.">

<configuration description="Runs UiTracingPerfTests metric instrumentation.">

    <option name="config-descriptor:metadata" key="test-type" value="performance" />



    <option name="test-suite-tag" value="apct" />

    <option name="test-suite-tag" value="apct-metric-instrumentation" />

    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">

        <option name="cleanup-apks" value="true" />

        <option name="test-file-name" value="ProtologPerfTests.apk" />

        <option name="test-file-name" value="UiTracingPerfTests.apk" />

    </target_preparer>



    <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
@@ -40,7 +40,7 @@ 
    <option name="isolated-storage" value="false" />



    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

        <option name="package" value="com.android.perftests.protolog" />

        <option name="package" value="android.tracing.perftests" />

        <option name="hidden-api-checks" value="false"/>



        <!-- Listener related args for collecting the traces and waiting for the device to stabilize. -->

api/Android.bp

+22 −22
Original line number Diff line number Diff line
@@ -87,12 +87,12 @@ combined_apis { 
        "framework-pdf-v",

        "framework-permission",

        "framework-permission-s",

        "framework-profiling",

        "framework-photopicker",

        "framework-profiling",

        "framework-scheduling",

        "framework-sdkextensions",

        "framework-statsd",

        "framework-sdksandbox",

        "framework-statsd",

        "framework-tethering",

        "framework-uwb",

        "framework-virtualization",
@@ -161,8 +161,8 @@ java_genrule { 
java_genrule {

    name: "frameworks-base-api-current-compat",

    srcs: [

        ":android.api.merged.public.latest",

        ":android-incompatibilities.api.public.latest",

        ":android.api.merged.public.latest",

        ":frameworks-base-api-current.txt",

    ],

    out: ["updated-baseline.txt"],
@@ -191,8 +191,8 @@ java_genrule { 
java_genrule {

    name: "frameworks-base-api-system-current-compat",

    srcs: [

        ":android.api.merged.system.latest",

        ":android-incompatibilities.api.system.latest",

        ":android.api.merged.system.latest",

        ":frameworks-base-api-current.txt",

        ":frameworks-base-api-system-current.txt",

    ],
@@ -223,11 +223,11 @@ java_genrule { 
java_genrule {

    name: "frameworks-base-api-module-lib-current-compat",

    srcs: [

        ":android.api.merged.module-lib.latest",

        ":android-incompatibilities.api.module-lib.latest",

        ":android.api.merged.module-lib.latest",

        ":frameworks-base-api-current.txt",

        ":frameworks-base-api-system-current.txt",

        ":frameworks-base-api-module-lib-current.txt",

        ":frameworks-base-api-system-current.txt",

    ],

    out: ["updated-baseline.txt"],

    tools: ["metalava"],
@@ -246,8 +246,8 @@ java_genrule { 
    out: ["current.srcjar"],

    cmd: "$(location merge_zips) $(out) $(in)",

    srcs: [

        ":api-stubs-docs-non-updatable{.exportable}",

        ":all-modules-public-stubs-source-exportable",

        ":api-stubs-docs-non-updatable{.exportable}",

    ],

    visibility: ["//visibility:private"], // Used by make module in //development, mind

}
@@ -269,8 +269,8 @@ java_genrule { 
    name: "sdk-annotations.zip",

    defaults: ["sdk-annotations-defaults"],

    srcs: [

        ":android-non-updatable-doc-stubs{.exportable.annotations.zip}",

        ":all-modules-public-annotations",

        ":android-non-updatable-doc-stubs{.exportable.annotations.zip}",

    ],

}
@@ -278,8 +278,8 @@ java_genrule { 
    name: "sdk-annotations-system.zip",

    defaults: ["sdk-annotations-defaults"],

    srcs: [

        ":android-non-updatable-doc-stubs-system{.exportable.annotations.zip}",

        ":all-modules-system-annotations",

        ":android-non-updatable-doc-stubs-system{.exportable.annotations.zip}",

    ],

}
@@ -287,8 +287,8 @@ java_genrule { 
    name: "sdk-annotations-module-lib.zip",

    defaults: ["sdk-annotations-defaults"],

    srcs: [

        ":android-non-updatable-doc-stubs-module-lib{.exportable.annotations.zip}",

        ":all-modules-module-lib-annotations",

        ":android-non-updatable-doc-stubs-module-lib{.exportable.annotations.zip}",

    ],

}
@@ -296,8 +296,8 @@ java_genrule { 
    name: "sdk-annotations-system-server.zip",

    defaults: ["sdk-annotations-defaults"],

    srcs: [

        ":android-non-updatable-doc-stubs-system-server{.exportable.annotations.zip}",

        ":all-modules-system-server-annotations",

        ":android-non-updatable-doc-stubs-system-server{.exportable.annotations.zip}",

    ],

}
@@ -307,10 +307,10 @@ java_genrule { 
        "//frameworks/base/boot",

    ],

    srcs: [

        ":frameworks-base-api-removed.txt",

        ":frameworks-base-api-system-removed.txt",

        ":android.car-stubs-docs{.removed-api.txt}",

        ":android.car-system-stubs-docs{.removed-api.txt}",

        ":frameworks-base-api-removed.txt",

        ":frameworks-base-api-system-removed.txt",

    ],

    tool_files: ["gen_combined_removed_dex.sh"],

    tools: ["metalava"],
@@ -322,8 +322,8 @@ java_genrule { 
    name: "api_fingerprint",

    srcs: [

        ":frameworks-base-api-current.txt",

        ":frameworks-base-api-system-current.txt",

        ":frameworks-base-api-module-lib-current.txt",

        ":frameworks-base-api-system-current.txt",

        ":frameworks-base-api-system-server-current.txt",

    ],

    out: ["api_fingerprint.txt"],
@@ -381,9 +381,6 @@ stubs_defaults { 
            "frameworks/base/media/aidl",

            "frameworks/base/telephony/java",

            "frameworks/native/libs/permission/aidl",

            "packages/modules/Bluetooth/framework/aidl-export",

            "packages/modules/Connectivity/framework/aidl-export",

            "packages/modules/Media/apex/aidl/stable",

            "hardware/interfaces/biometrics/common/aidl",

            "hardware/interfaces/biometrics/fingerprint/aidl",

            "hardware/interfaces/common/aidl",
@@ -391,6 +388,9 @@ stubs_defaults { 
            "hardware/interfaces/graphics/common/aidl",

            "hardware/interfaces/keymaster/aidl",

            "hardware/interfaces/power/aidl",

            "packages/modules/Bluetooth/framework/aidl-export",

            "packages/modules/Connectivity/framework/aidl-export",

            "packages/modules/Media/apex/aidl/stable",

            "system/hardware/interfaces/media/aidl",

        ],

    },
@@ -400,10 +400,10 @@ stubs_defaults { 
    // dependencies gets bigger.

    libs: android_non_updatable_stubs_libs,

    flags: [

        "--error FlaggedApiLiteral",

        "--error NoSettingsProvider",

        "--error UnhiddenSystemApi",

        "--error UnflaggedApi",

        "--error FlaggedApiLiteral",

        "--error UnhiddenSystemApi",

        "--force-convert-to-warning-nullability-annotations +*:-android.*:+android.icu.*:-dalvik.*",

        // Disable CallbackInterface, as Java 8 default interface methods avoid the extensibility

        // issue interfaces had previously.
@@ -441,8 +441,8 @@ soong_config_module_type { 
// so use the prebuilt module-lib stubs for modules that export module-lib stubs that the

// non-updatable part depends on.

non_updatable_api_deps_on_modules = [

    "sdk_module-lib_current_framework-tethering",

    "sdk_module-lib_current_framework-connectivity-t",

    "sdk_module-lib_current_framework-tethering",

    "sdk_system_current_android",

]
@@ -492,8 +492,8 @@ java_defaults { 
    impl_library_visibility: ["//frameworks/base"],

    defaults_visibility: [

        "//frameworks/base/location",

        "//frameworks/base/packages/CrashRecovery/framework",

        "//frameworks/base/nfc",

        "//frameworks/base/packages/CrashRecovery/framework",

        "//packages/modules/NeuralNetworks:__subpackages__",

    ],

    plugins: ["error_prone_android_framework"],
@@ -562,7 +562,7 @@ phony_rule { 
    name: "checkapi",

    phony_deps: [

        "frameworks-base-api-current-compat",

        "frameworks-base-api-system-current-compat",

        "frameworks-base-api-module-lib-current-compat",

        "frameworks-base-api-system-current-compat",

    ],

}

api/ApiDocs.bp

+24 −25
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ stubs_defaults { 


        ":framework-adservices-sources",

        ":framework-appsearch-sources",

        ":framework-connectivity-sources",

        ":framework-bluetooth-sources",

        ":framework-connectivity-sources",

        ":framework-connectivity-tiramisu-updatable-sources",

        ":framework-graphics-srcs",

        ":framework-healthfitness-sources",
@@ -66,13 +66,13 @@ stubs_defaults { 
        ":framework-nearby-sources",

        ":framework-nfc-updatable-sources",

        ":framework-ondevicepersonalization-sources",

        ":framework-permission-sources",

        ":framework-permission-s-sources",

        ":framework-permission-sources",

        ":framework-profiling-sources",

        ":framework-scheduling-sources",

        ":framework-sdkextensions-sources",

        ":framework-statsd-sources",

        ":framework-sdksandbox-sources",

        ":framework-statsd-sources",

        ":framework-tethering-srcs",

        ":framework-uwb-updatable-sources",

        ":framework-wifi-updatable-sources",
@@ -105,8 +105,8 @@ droidstubs { 
        "module-classpath-stubs-defaults",

    ],

    flags: [

        "--show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\)",

        "--show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.MODULE_LIBRARIES\\)",

        "--show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\)",

    ],

    generate_stubs: false, // We're only using this module for the annotations.zip output, disable doc-stubs.

    write_sdk_values: false,
@@ -119,8 +119,8 @@ droidstubs { 
        "module-classpath-stubs-defaults",

    ],

    flags: [

        "--show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\)",

        "--show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.MODULE_LIBRARIES\\)",

        "--show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS\\)",

        "--show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.SYSTEM_SERVER\\)",

    ],

    generate_stubs: false, // We're only using this module for the annotations.zip output, disable doc-stubs.
@@ -194,8 +194,8 @@ doc_defaults { 
        "docs/html",

    ],

    knowntags: [

        "docs/knowntags.txt",

        ":art.module.public.api{.doctags}",

        "docs/knowntags.txt",

    ],

    custom_template: "droiddoc-templates-sdk",

    resourcesdir: "docs/html/reference/images/",
@@ -203,15 +203,15 @@ doc_defaults { 
    lint_baseline: "javadoc-lint-baseline",

    flags: [

        "-android",

        "-lerror",

        "-manifest $(location :frameworks-base-core-AndroidManifest.xml)",

        "-metalavaApiSince",

        "-werror",

        "-lerror",

        "-overview $(location :frameworks-base-java-overview)",

        // Federate Support Library references against local API file.

        "-federate SupportLib https://developer.android.com",

        "-federationapi SupportLib $(location :current-support-api)",

        // Federate Support Library references against local API file.

        "-werror",

        "-federate AndroidX https://developer.android.com",

        "-federationapi AndroidX $(location :current-androidx-api)",

        // doclava contains checks for a few issues that are have been migrated to metalava.
@@ -227,16 +227,16 @@ doc_defaults { 
    hdf: [

        "dac true",

        "sdk.codename O",

        "sdk.preview 0",

        "sdk.preview.version 1",

        "sdk.version 7.0",

        "sdk.rel.id 1",

        "sdk.preview 0",

        "sdk.version 7.0",

    ],

    arg_files: [

        ":current-androidx-api",

        ":current-support-api",

        ":frameworks-base-core-AndroidManifest.xml",

        ":frameworks-base-java-overview",

        ":current-support-api",

        ":current-androidx-api",

    ],

    // TODO(b/169090544): remove below aidl includes.

    aidl: {
@@ -281,8 +281,8 @@ droiddoc { 
    proofread_file: "offline-sdk-referenceonly-docs-proofread.txt",

    flags: [

        "-offlinemode",

        "-title \"Android SDK\"",

        "-referenceonly",

        "-title \"Android SDK\"",

    ],

    static_doc_index_redirect: "docs/docs-documentation-redirect.html",

    static_doc_properties: "docs/source.properties",
@@ -306,8 +306,8 @@ droiddoc { 
        "-hide 104",

        "-hide 108",

        "-offlinemode",

        "-title \"Android System SDK\"",

        "-referenceonly",

        "-title \"Android System SDK\"",

    ],

    static_doc_index_redirect: "docs/docs-documentation-redirect.html",

    static_doc_properties: "docs/source.properties",
@@ -320,13 +320,13 @@ droiddoc { 
        ":framework-doc-stubs{.exportable}",

    ],

    hdf: [

        "android.whichdoc online",

        "android.hasSamples true",

        "android.whichdoc online",

    ],

    proofread_file: "ds-docs-proofread.txt",

    flags: [

        " -toroot /",

        "-yamlV2",

        "-devsite",

        "-samplegroup Admin",

        "-samplegroup Background",

        "-samplegroup Connectivity",
@@ -342,9 +342,8 @@ droiddoc { 
        "-samplegroup UI",

        "-samplegroup Views",

        "-samplegroup Wearable",

        "-devsite",

        "-samplesdir",

        "development/samples/browseable",

        "-samplesdir development/samples/browseable",

        "-yamlV2",

    ],

}
@@ -354,8 +353,8 @@ droiddoc { 
        ":framework-doc-stubs{.exportable}",

    ],

    flags: [

        "-noJdkLink",

        "-links https://kotlinlang.org/api/latest/jvm/stdlib/^external/dokka/package-list",

        "-noJdkLink",

        "-noStdlibLink",

    ],

    proofread_file: "ds-dokka-proofread.txt",
@@ -365,8 +364,8 @@ droiddoc { 
java_genrule {

    name: "ds-docs",

    tools: [

        "zip2zip",

        "merge_zips",

        "zip2zip",

    ],

    srcs: [

        ":ds-docs-java{.docs.zip}",
@@ -383,8 +382,8 @@ java_genrule { 
java_genrule {

    name: "ds-docs-switched",

    tools: [

        "switcher4",

        "soong_zip",

        "switcher4",

    ],

    srcs: [

        ":ds-docs-java{.docs.zip}",
@@ -411,10 +410,10 @@ droiddoc { 
        "android.whichdoc online",

    ],

    flags: [

        "-staticonly",

        "-toroot /",

        "-devsite",

        "-ignoreJdLinks",

        "-staticonly",

        "-toroot /",

    ],

}
@@ -428,8 +427,8 @@ droiddoc { 
        "android.whichdoc online",

    ],

    flags: [

        "-toroot /",

        "-atLinksNavtree",

        "-navtreeonly",

        "-toroot /",

    ],

}