diff --git a/.prebuilt_info/prebuilt_info_packages_CtsShim_apk__riscv64_CtsShimPriv_apk.asciipb b/.prebuilt_info/prebuilt_info_packages_CtsShim_apk__riscv64_CtsShimPriv_apk.asciipb index e89809138548d45f2f4e8a1aedbff303a4aa07af..e8e7ec9017857b983ba593e24e3a0696add87b5a 100644 --- a/.prebuilt_info/prebuilt_info_packages_CtsShim_apk__riscv64_CtsShimPriv_apk.asciipb +++ b/.prebuilt_info/prebuilt_info_packages_CtsShim_apk__riscv64_CtsShimPriv_apk.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "9653376" + build_id: "11947186" target: "CtsShim" source_file: "aosp_riscv64/CtsShimPriv.apk" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/frameworks/base" - git_branch: "master" + git_branch: "main" transform: TRANSFORM_NONE transform_options { } diff --git a/.prebuilt_info/prebuilt_info_packages_CtsShim_apk__riscv64_CtsShim_apk.asciipb b/.prebuilt_info/prebuilt_info_packages_CtsShim_apk__riscv64_CtsShim_apk.asciipb index 04092366c257688325f97b71a52c6796332dc2d4..6113b6a6dc8f289875ca897a57cc8880ce690f93 100644 --- a/.prebuilt_info/prebuilt_info_packages_CtsShim_apk__riscv64_CtsShim_apk.asciipb +++ b/.prebuilt_info/prebuilt_info_packages_CtsShim_apk__riscv64_CtsShim_apk.asciipb @@ -1,6 +1,6 @@ drops { android_build_drop { - build_id: "9653376" + build_id: "11947186" target: "CtsShim" source_file: "aosp_riscv64/CtsShim.apk" } @@ -8,7 +8,7 @@ drops { version: "" version_group: "" git_project: "platform/frameworks/base" - git_branch: "master" + git_branch: "main" transform: TRANSFORM_NONE transform_options { } diff --git a/AconfigFlags.bp b/AconfigFlags.bp index e71ded922ae66720ce11da38c0eb0ded819fbc06..403bb74e12d4af8fbb956e63be59f182916342e4 100644 --- a/AconfigFlags.bp +++ b/AconfigFlags.bp @@ -21,11 +21,15 @@ aconfig_declarations_group { java_aconfig_libraries: [ // !!! KEEP THIS LIST ALPHABETICAL !!! "aconfig_mediacodec_flags_java_lib", + "android-sdk-flags-java", "android.adaptiveauth.flags-aconfig-java", + "android.app.appfunctions.flags-aconfig-java", "android.app.contextualsearch.flags-aconfig-java", "android.app.flags-aconfig-java", + "android.app.jank.flags-aconfig-java", "android.app.ondeviceintelligence-aconfig-java", "android.app.smartspace.flags-aconfig-java", + "android.app.supervision.flags-aconfig-java", "android.app.usage.flags-aconfig-java", "android.app.wearable.flags-aconfig-java", "android.appwidget.flags-aconfig-java", @@ -101,6 +105,9 @@ aconfig_declarations_group { "framework-jobscheduler-job.flags-aconfig-java", "framework_graphics_flags_java_lib", "hwui_flags_java_lib", + "interaction_jank_monitor_flags_lib", + "libcore_exported_aconfig_flags_lib", + "libgui_flags_java_lib", "power_flags_lib", "sdk_sandbox_flags_lib", "surfaceflinger_flags_java_lib", @@ -151,6 +158,14 @@ java_aconfig_library { defaults: ["framework-minus-apex-aconfig-java-defaults"], } +// Core Libraries / libcore +java_aconfig_library { + name: "libcore_exported_aconfig_flags_lib", + aconfig_declarations: "libcore-aconfig-flags", + mode: "exported", + defaults: ["framework-minus-apex-aconfig-java-defaults"], +} + // Telecom java_aconfig_library { name: "telecom_flags_core_java_lib", @@ -173,6 +188,7 @@ cc_aconfig_library { // Window aconfig_declarations { name: "com.android.window.flags.window-aconfig", + exportable: true, package: "com.android.window.flags", container: "system", srcs: ["core/java/android/window/flags/*.aconfig"], @@ -244,6 +260,12 @@ cc_aconfig_library { aconfig_declarations: "com.android.text.flags-aconfig", } +rust_aconfig_library { + name: "libandroid_text_flags_rust", + crate_name: "android_text_flags", + aconfig_declarations: "com.android.text.flags-aconfig", +} + // Location aconfig_declarations { name: "android.location.flags-aconfig", @@ -374,6 +396,7 @@ java_aconfig_library { min_sdk_version: "30", apex_available: [ "//apex_available:platform", + "com.android.btservices", "com.android.mediaprovider", "com.android.permission", ], @@ -414,6 +437,8 @@ java_aconfig_library { cc_aconfig_library { name: "android.companion.virtualdevice.flags-aconfig-cc", aconfig_declarations: "android.companion.virtualdevice.flags-aconfig", + host_supported: true, + mode: "test", } java_aconfig_library { @@ -426,9 +451,22 @@ aconfig_declarations { name: "android.companion.virtualdevice.flags-aconfig", package: "android.companion.virtualdevice.flags", container: "system", + exportable: true, srcs: ["core/java/android/companion/virtual/flags/*.aconfig"], } +java_aconfig_library { + name: "android.companion.virtualdevice.flags-aconfig-java-export", + aconfig_declarations: "android.companion.virtualdevice.flags-aconfig", + defaults: ["framework-minus-apex-aconfig-java-defaults"], + mode: "exported", + min_sdk_version: "30", + apex_available: [ + "//apex_available:platform", + "com.android.permission", + ], +} + java_aconfig_library { name: "android.companion.virtual.flags-aconfig-java", aconfig_declarations: "android.companion.virtual.flags-aconfig", @@ -686,7 +724,7 @@ aconfig_declarations { exportable: true, package: "android.media.tv.flags", container: "system", - srcs: ["media/java/android/media/tv/flags/media_tv.aconfig"], + srcs: ["media/java/android/media/tv/flags/*.aconfig"], } java_aconfig_library { @@ -1105,6 +1143,7 @@ cc_aconfig_library { // Chooser / "Sharesheet" aconfig_declarations { name: "android.service.chooser.flags-aconfig", + exportable: true, package: "android.service.chooser", container: "system", srcs: ["core/java/android/service/chooser/flags.aconfig"], @@ -1206,6 +1245,21 @@ java_aconfig_library { defaults: ["framework-minus-apex-aconfig-java-defaults"], } +// Supervision +aconfig_declarations { + name: "android.app.supervision.flags-aconfig", + exportable: true, + package: "android.app.supervision.flags", + container: "system", + srcs: ["core/java/android/app/supervision/flags.aconfig"], +} + +java_aconfig_library { + name: "android.app.supervision.flags-aconfig-java", + aconfig_declarations: "android.app.supervision.flags-aconfig", + defaults: ["framework-minus-apex-aconfig-java-defaults"], +} + // SurfaceFlinger java_aconfig_library { name: "surfaceflinger_flags_java_lib", @@ -1213,6 +1267,12 @@ java_aconfig_library { defaults: ["framework-minus-apex-aconfig-java-defaults"], } +java_aconfig_library { + name: "libgui_flags_java_lib", + aconfig_declarations: "libgui_flags", + defaults: ["framework-minus-apex-aconfig-java-defaults"], +} + // Content Capture aconfig_declarations { name: "android.view.contentcapture.flags-aconfig", @@ -1372,6 +1432,33 @@ java_aconfig_library { defaults: ["framework-minus-apex-aconfig-java-defaults"], } +// AppFunctions +aconfig_declarations { + name: "android.app.appfunctions.flags-aconfig", + exportable: true, + package: "android.app.appfunctions.flags", + container: "system", + srcs: ["core/java/android/app/appfunctions/flags/flags.aconfig"], +} + +java_aconfig_library { + name: "android.app.appfunctions.flags-aconfig-java", + aconfig_declarations: "android.app.appfunctions.flags-aconfig", + defaults: ["framework-minus-apex-aconfig-java-defaults"], +} + +java_aconfig_library { + name: "android.app.appfunctions.exported-flags-aconfig-java", + aconfig_declarations: "android.app.appfunctions.flags-aconfig", + defaults: ["framework-minus-apex-aconfig-java-defaults"], + mode: "exported", + apex_available: [ + "//apex_available:platform", + "com.android.permission", + ], + min_sdk_version: "30", +} + // Adaptive Auth aconfig_declarations { name: "android.adaptiveauth.flags-aconfig", @@ -1507,6 +1594,13 @@ java_aconfig_library { defaults: ["framework-minus-apex-aconfig-java-defaults"], } +java_aconfig_library { + name: "backstage_power_flags_lib-host", + aconfig_declarations: "backstage_power_flags", + host_supported: true, + defaults: ["framework-minus-apex-aconfig-java-defaults"], +} + // Dropbox data aconfig_declarations { name: "dropbox_flags", @@ -1523,6 +1617,34 @@ java_aconfig_library { defaults: ["framework-minus-apex-aconfig-java-defaults"], } +// Zero Jank +aconfig_declarations { + name: "interaction_jank_monitor_flags", + package: "com.android.internal.jank", + container: "system", + srcs: ["core/java/com/android/internal/jank/flags.aconfig"], +} + +java_aconfig_library { + name: "interaction_jank_monitor_flags_lib", + aconfig_declarations: "interaction_jank_monitor_flags", + defaults: ["framework-minus-apex-aconfig-java-defaults"], +} + +// App Jank +aconfig_declarations { + name: "android.app.jank.flags-aconfig", + package: "android.app.jank", + container: "system", + srcs: ["core/java/android/app/jank/flags.aconfig"], +} + +java_aconfig_library { + name: "android.app.jank.flags-aconfig-java", + aconfig_declarations: "android.app.jank.flags-aconfig", + defaults: ["framework-minus-apex-aconfig-java-defaults"], +} + // Trade in mode aconfig_declarations { name: "aconfig_trade_in_mode_flags", diff --git a/Android.bp b/Android.bp index d2e80034423b8c0870b296ae169118a085da78fd..e537480a376e6e18d57db07c960aa51a3753a051 100644 --- a/Android.bp +++ b/Android.bp @@ -97,6 +97,8 @@ filegroup { ":android.frameworks.location.altitude-V2-java-source", ":android.hardware.biometrics.common-V4-java-source", ":android.hardware.biometrics.fingerprint-V5-java-source", + ":android.hardware.biometrics.fingerprint.virtualhal-java-source", + ":android.hardware.biometrics.face.virtualhal-java-source", ":android.hardware.biometrics.face-V4-java-source", ":android.hardware.gnss-V2-java-source", ":android.hardware.graphics.common-V3-java-source", @@ -108,7 +110,7 @@ filegroup { ":android.hardware.security.keymint-V3-java-source", ":android.hardware.security.secureclock-V1-java-source", ":android.hardware.thermal-V2-java-source", - ":android.hardware.tv.tuner-V2-java-source", + ":android.hardware.tv.tuner-V3-java-source", ":android.security.apc-java-source", ":android.security.authorization-java-source", ":android.security.legacykeystore-java-source", @@ -248,7 +250,7 @@ java_library { "android.hardware.vibrator-V1.1-java", "android.hardware.vibrator-V1.2-java", "android.hardware.vibrator-V1.3-java", - "android.hardware.vibrator-V2-java", + "android.hardware.vibrator-V3-java", "android.se.omapi-V1-java", "android.system.suspend.control.internal-java", "devicepolicyprotosnano", @@ -418,6 +420,7 @@ java_defaults { "modules-utils-expresslog", "perfetto_trace_javastream_protos_jarjar", "libaconfig_java_proto_nano", + "aconfig_device_paths_java", ], } diff --git a/SQLITE_OWNERS b/SQLITE_OWNERS index 1ff72e7689a7ba9cba8ed83d72e1b897aed3fcba..783a0b6f6212349e92a911e80da1d01fe4b973aa 100644 --- a/SQLITE_OWNERS +++ b/SQLITE_OWNERS @@ -1,2 +1,9 @@ +# Android platform SQLite owners are responsible for: +# 1. Periodically updating libsqlite from upstream sqlite.org. +# 2. Escalating libsqlite bug reports to upstream sqlite.org. +# 3. Addressing bugs, performance regressions, and feature requests +# in Android SDK SQLite wrappers (android.database.sqlite.*). +# 4. Reviewing proposed changes to said Android SDK SQLite wrappers. + shayba@google.com shombert@google.com diff --git a/TEST_MAPPING b/TEST_MAPPING index bdae506115e8517675aa7c43a2c6b87767a7277f..e469f167d32f6afcc5eb1bc5259f71987ac896ef 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -52,13 +52,20 @@ "name": "CtsStrictJavaPackagesTestCases" } ], - "postsubmit-ravenwood": [ + "ravenwood-presubmit": [ { "name": "CtsUtilTestCasesRavenwood", "host": true, "file_patterns": [ "[Rr]avenwood" ] + }, + { + "name": "RavenwoodBivalentTest", + "host": true, + "file_patterns": [ + "[Rr]avenwood" + ] } ], "postsubmit-managedprofile-stress": [ diff --git a/WEAR_OWNERS b/WEAR_OWNERS index 4ffb239e24ceb14373c8929765edb43a6250204e..52c07e01cdbec7c210cfb0a8e7b208aa4881901f 100644 --- a/WEAR_OWNERS +++ b/WEAR_OWNERS @@ -12,3 +12,4 @@ nalmalki@google.com shijianli@google.com latkin@google.com djsollen@google.com +hdhabu@google.com \ No newline at end of file diff --git a/android-sdk-flags/Android.bp b/android-sdk-flags/Android.bp new file mode 100644 index 0000000000000000000000000000000000000000..79a0b9a4f27300eacf0819bc1b93a6c50e0c6430 --- /dev/null +++ b/android-sdk-flags/Android.bp @@ -0,0 +1,30 @@ +// Copyright (C) 2024 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package { + default_applicable_licenses: ["frameworks_base_license"], +} + +aconfig_declarations { + name: "android-sdk-flags", + package: "android.sdk", + container: "system", + srcs: ["flags.aconfig"], +} + +java_aconfig_library { + name: "android-sdk-flags-java", + aconfig_declarations: "android-sdk-flags", + defaults: ["framework-minus-apex-aconfig-java-defaults"], +} diff --git a/android-sdk-flags/flags.aconfig b/android-sdk-flags/flags.aconfig new file mode 100644 index 0000000000000000000000000000000000000000..cfe298e187d150fe9a63bf926797117f772af857 --- /dev/null +++ b/android-sdk-flags/flags.aconfig @@ -0,0 +1,12 @@ +package: "android.sdk" +container: "system" + +flag { + name: "major_minor_versioning_scheme" + namespace: "android_sdk" + description: "Use the new SDK major.minor versioning scheme (e.g. Android 40.1) which replaces the old single-integer scheme (e.g. Android 15)." + bug: "350458259" + + # Use is_fixed_read_only because DeviceConfig may not be available when Build.VERSION_CODES is first accessed + is_fixed_read_only: true +} diff --git a/apct-tests/perftests/core/AndroidTest.xml b/apct-tests/perftests/core/AndroidTest.xml index 86f41e1f496c0912a66764ddc51b6db9a4bf3f1c..c2d54707d9f2d0506e0cdba4fd1c1ec61031ef3b 100644 --- a/apct-tests/perftests/core/AndroidTest.xml +++ b/apct-tests/perftests/core/AndroidTest.xml @@ -17,6 +17,17 @@