Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529
Merged-In: I46c7859ff042ee7aa9193757e5df8269f4892362
Change-Id: I0c7b5036c0b0f5f2caad551edb063350f6eb87e7
diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index 9eb41c9..eb896d6 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -15,21 +15,67 @@
aconfig_srcjars = [
// !!! KEEP THIS LIST ALPHABETICAL !!!
":aconfig_mediacodec_flags_java_lib{.generated_srcjars}",
+ ":android.app.flags-aconfig-java{.generated_srcjars}",
+ ":android.app.smartspace.flags-aconfig-java{.generated_srcjars}",
+ ":android.app.usage.flags-aconfig-java{.generated_srcjars}",
+ ":android.appwidget.flags-aconfig-java{.generated_srcjars}",
+ ":android.companion.flags-aconfig-java{.generated_srcjars}",
+ ":android.companion.virtual.flags-aconfig-java{.generated_srcjars}",
":android.content.pm.flags-aconfig-java{.generated_srcjars}",
":android.content.res.flags-aconfig-java{.generated_srcjars}",
":android.crashrecovery.flags-aconfig-java{.generated_srcjars}",
+ ":android.credentials.flags-aconfig-java{.generated_srcjars}",
+ ":android.database.sqlite-aconfig-java{.generated_srcjars}",
":android.hardware.biometrics.flags-aconfig-java{.generated_srcjars}",
+ ":android.hardware.flags-aconfig-java{.generated_srcjars}",
+ ":android.hardware.radio.flags-aconfig-java{.generated_srcjars}",
+ ":android.hardware.usb.flags-aconfig-java{.generated_srcjars}",
+ ":android.location.flags-aconfig-java{.generated_srcjars}",
":android.media.playback.flags-aconfig-java{.generated_srcjars}",
+ ":android.media.tv.flags-aconfig-java{.generated_srcjars}",
+ ":android.multiuser.flags-aconfig-java{.generated_srcjars}",
":android.net.vcn.flags-aconfig-java{.generated_srcjars}",
":android.nfc.flags-aconfig-java{.generated_srcjars}",
":android.os.flags-aconfig-java{.generated_srcjars}",
+ ":android.os.vibrator.flags-aconfig-java{.generated_srcjars}",
+ ":android.permission.flags-aconfig-java{.generated_srcjars}",
+ ":android.provider.flags-aconfig-java{.generated_srcjars}",
":android.security.flags-aconfig-java{.generated_srcjars}",
- ":com.android.hardware.camera2-aconfig-java{.generated_srcjars}",
+ ":android.server.app.flags-aconfig-java{.generated_srcjars}",
+ ":android.service.autofill.flags-aconfig-java{.generated_srcjars}",
+ ":android.service.chooser.flags-aconfig-java{.generated_srcjars}",
+ ":android.service.controls.flags-aconfig-java{.generated_srcjars}",
+ ":android.service.dreams.flags-aconfig-java{.generated_srcjars}",
+ ":android.service.notification.flags-aconfig-java{.generated_srcjars}",
+ ":android.service.voice.flags-aconfig-java{.generated_srcjars}",
+ ":android.tracing.flags-aconfig-java{.generated_srcjars}",
+ ":android.view.accessibility.flags-aconfig-java{.generated_srcjars}",
+ ":android.view.contentcapture.flags-aconfig-java{.generated_srcjars}",
+ ":android.view.contentprotection.flags-aconfig-java{.generated_srcjars}",
+ ":android.view.flags-aconfig-java{.generated_srcjars}",
+ ":android.view.inputmethod.flags-aconfig-java{.generated_srcjars}",
+ ":android.webkit.flags-aconfig-java{.generated_srcjars}",
+ ":android.widget.flags-aconfig-java{.generated_srcjars}",
+ ":audio-framework-aconfig",
+ ":camera_platform_flags_core_java_lib{.generated_srcjars}",
":com.android.hardware.input-aconfig-java{.generated_srcjars}",
+ ":com.android.input.flags-aconfig-java{.generated_srcjars}",
+ ":com.android.internal.foldables.flags-aconfig-java{.generated_srcjars}",
+ ":com.android.media.flags.bettertogether-aconfig-java{.generated_srcjars}",
":com.android.net.flags-aconfig-java{.generated_srcjars}",
":com.android.net.thread.flags-aconfig-java{.generated_srcjars}",
+ ":com.android.server.flags.pinner-aconfig-java{.generated_srcjars}",
":com.android.text.flags-aconfig-java{.generated_srcjars}",
":com.android.window.flags.window-aconfig-java{.generated_srcjars}",
+ ":device_policy_aconfig_flags_lib{.generated_srcjars}",
+ ":display_flags_lib{.generated_srcjars}",
+ ":framework-jobscheduler-job.flags-aconfig-java{.generated_srcjars}",
+ ":framework_graphics_flags_java_lib{.generated_srcjars}",
+ ":hwui_flags_java_lib{.generated_srcjars}",
+ ":sdk_sandbox_flags_lib{.generated_srcjars}",
+ ":surfaceflinger_flags_java_lib{.generated_srcjars}",
+ ":telecom_flags_core_java_lib{.generated_srcjars}",
+ ":telephony_flags_core_java_lib{.generated_srcjars}",
// !!! KEEP THIS LIST ALPHABETICAL !!!
]
@@ -45,9 +91,8 @@
"android.nfc.flags-aconfig",
"android.os.flags-aconfig",
"android.security.flags-aconfig",
- "com.android.hardware.camera2-aconfig",
+ "camera_platform_flags",
"com.android.hardware.input.input-aconfig",
- "com.android.net.thread.flags-aconfig",
"com.android.window.flags.window-aconfig",
"com.android.text.flags-aconfig",
"com.android.net.flags-aconfig",
@@ -62,10 +107,9 @@
// Aconfig declarations and libraries for the core framework
java_defaults {
name: "framework-minus-apex-aconfig-libraries",
-
// Add java_aconfig_libraries to here to add them to the core framework
- // Add aconfig-annotations-lib as a dependency for the optimization
srcs: aconfig_srcjars,
+ // Add aconfig-annotations-lib as a dependency for the optimization
libs: ["aconfig-annotations-lib"],
}
@@ -78,18 +122,31 @@
}
// Camera
-aconfig_declarations {
- name: "com.android.hardware.camera2-aconfig",
- package: "com.android.hardware.camera2",
- srcs: ["core/java/android/hardware/camera2/camera_platform.aconfig"],
+java_aconfig_library {
+ name: "camera_platform_flags_core_java_lib",
+ aconfig_declarations: "camera_platform_flags",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
}
+// Telecom
java_aconfig_library {
- name: "com.android.hardware.camera2-aconfig-java",
- aconfig_declarations: "com.android.hardware.camera2-aconfig",
+ name: "telecom_flags_core_java_lib",
+ aconfig_declarations: "telecom_flags",
defaults: ["framework-minus-apex-aconfig-java-defaults"],
}
+// Telephony
+java_aconfig_library {
+ name: "telephony_flags_core_java_lib",
+ aconfig_declarations: "telephony_flags",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+cc_aconfig_library {
+ name: "telephony_flags_c_lib",
+ aconfig_declarations: "telephony_flags",
+}
+
// Window
aconfig_declarations {
name: "com.android.window.flags.window-aconfig",
@@ -116,6 +173,12 @@
defaults: ["framework-minus-apex-aconfig-java-defaults"],
}
+java_aconfig_library {
+ name: "com.android.input.flags-aconfig-java",
+ aconfig_declarations: "com.android.input.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
// Text
aconfig_declarations {
name: "com.android.text.flags-aconfig",
@@ -129,16 +192,23 @@
defaults: ["framework-minus-apex-aconfig-java-defaults"],
}
-// OS
+cc_aconfig_library {
+ name: "aconfig_text_flags_c_lib",
+ aconfig_declarations: "com.android.text.flags-aconfig",
+}
+
+// Location
aconfig_declarations {
- name: "android.os.flags-aconfig",
- package: "android.os",
- srcs: ["core/java/android/os/*.aconfig"],
+ name: "android.location.flags-aconfig",
+ package: "android.location.flags",
+ srcs: [
+ "location/java/android/location/flags/*.aconfig",
+ ],
}
java_aconfig_library {
- name: "android.os.flags-aconfig-java",
- aconfig_declarations: "android.os.flags-aconfig",
+ name: "android.location.flags-aconfig-java",
+ aconfig_declarations: "android.location.flags-aconfig",
defaults: ["framework-minus-apex-aconfig-java-defaults"],
}
@@ -192,6 +262,157 @@
defaults: ["framework-minus-apex-aconfig-java-defaults"],
}
+// UsageStats
+aconfig_declarations {
+ name: "android.app.usage.flags-aconfig",
+ package: "android.app.usage",
+ srcs: ["core/java/android/app/usage/*.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.app.usage.flags-aconfig-java",
+ aconfig_declarations: "android.app.usage.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+// OS
+aconfig_declarations {
+ name: "android.os.flags-aconfig",
+ package: "android.os",
+ srcs: ["core/java/android/os/*.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.os.flags-aconfig-java",
+ aconfig_declarations: "android.os.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+java_aconfig_library {
+ name: "android.os.flags-aconfig-java-host",
+ aconfig_declarations: "android.os.flags-aconfig",
+ host_supported: true,
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+// VirtualDeviceManager
+cc_aconfig_library {
+ name: "android.companion.virtualdevice.flags-aconfig-cc",
+ aconfig_declarations: "android.companion.virtualdevice.flags-aconfig",
+}
+
+java_aconfig_library {
+ name: "android.companion.virtualdevice.flags-aconfig-java",
+ aconfig_declarations: "android.companion.virtualdevice.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+aconfig_declarations {
+ name: "android.companion.virtualdevice.flags-aconfig",
+ package: "android.companion.virtualdevice.flags",
+ srcs: ["core/java/android/companion/virtual/flags/*.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.companion.virtual.flags-aconfig-java",
+ aconfig_declarations: "android.companion.virtual.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+aconfig_declarations {
+ name: "android.companion.virtual.flags-aconfig",
+ package: "android.companion.virtual.flags",
+ srcs: ["core/java/android/companion/virtual/*.aconfig"],
+}
+
+// InputMethod
+aconfig_declarations {
+ name: "android.view.inputmethod.flags-aconfig",
+ package: "android.view.inputmethod",
+ srcs: ["core/java/android/view/inputmethod/flags.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.view.inputmethod.flags-aconfig-java",
+ aconfig_declarations: "android.view.inputmethod.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+// Vibrator
+aconfig_declarations {
+ name: "android.os.vibrator.flags-aconfig",
+ package: "android.os.vibrator",
+ srcs: ["core/java/android/os/vibrator/*.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.os.vibrator.flags-aconfig-java",
+ aconfig_declarations: "android.os.vibrator.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+// View
+aconfig_declarations {
+ name: "android.view.flags-aconfig",
+ package: "android.view.flags",
+ srcs: ["core/java/android/view/flags/*.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.view.flags-aconfig-java",
+ aconfig_declarations: "android.view.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+cc_aconfig_library {
+ name: "aconfig_view_flags_c_lib",
+ aconfig_declarations: "android.view.flags-aconfig",
+}
+
+// View.accessibility
+aconfig_declarations {
+ name: "android.view.accessibility.flags-aconfig",
+ package: "android.view.accessibility",
+ srcs: ["core/java/android/view/accessibility/flags/*.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.view.accessibility.flags-aconfig-java",
+ aconfig_declarations: "android.view.accessibility.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+cc_aconfig_library {
+ name: "aconfig_view_accessibility_flags_c_lib",
+ aconfig_declarations: "android.view.accessibility.flags-aconfig",
+}
+
+// Hardware
+aconfig_declarations {
+ name: "android.hardware.flags-aconfig",
+ package: "android.hardware.flags",
+ srcs: ["core/java/android/hardware/flags/*.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.hardware.flags-aconfig-java",
+ aconfig_declarations: "android.hardware.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+// Widget
+aconfig_declarations {
+ name: "android.widget.flags-aconfig",
+ package: "android.widget.flags",
+ srcs: ["core/java/android/widget/flags/*.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.widget.flags-aconfig-java",
+ aconfig_declarations: "android.widget.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
rust_aconfig_library {
name: "libandroid_security_flags_rust",
crate_name: "android_security_flags",
@@ -231,6 +452,67 @@
defaults: ["framework-minus-apex-aconfig-java-defaults"],
}
+// Media BetterTogether
+aconfig_declarations {
+ name: "com.android.media.flags.bettertogether-aconfig",
+ package: "com.android.media.flags",
+ srcs: [
+ "media/java/android/media/flags/media_better_together.aconfig",
+ "media/java/android/media/flags/fade_manager_configuration.aconfig",
+ ],
+}
+
+java_aconfig_library {
+ name: "com.android.media.flags.bettertogether-aconfig-java",
+ aconfig_declarations: "com.android.media.flags.bettertogether-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+// Media TV
+aconfig_declarations {
+ name: "android.media.tv.flags-aconfig",
+ package: "android.media.tv.flags",
+ srcs: ["media/java/android/media/tv/flags/media_tv.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.media.tv.flags-aconfig-java",
+ aconfig_declarations: "android.media.tv.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+// Permissions
+aconfig_declarations {
+ name: "android.permission.flags-aconfig",
+ package: "android.permission.flags",
+ srcs: ["core/java/android/permission/flags.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.permission.flags-aconfig-java",
+ aconfig_declarations: "android.permission.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+ min_sdk_version: "30",
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.permission",
+ ],
+
+}
+
+// SQLite
+aconfig_declarations {
+ name: "android.database.sqlite-aconfig",
+ package: "android.database.sqlite",
+ srcs: ["core/java/android/database/sqlite/*.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.database.sqlite-aconfig-java",
+ aconfig_declarations: "android.database.sqlite-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
// Biometrics
aconfig_declarations {
name: "android.hardware.biometrics.flags-aconfig",
@@ -244,6 +526,165 @@
defaults: ["framework-minus-apex-aconfig-java-defaults"],
}
+// Graphics
+java_aconfig_library {
+ name: "hwui_flags_java_lib",
+ aconfig_declarations: "hwui_flags",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+java_aconfig_library {
+ name: "framework_graphics_flags_java_lib",
+ aconfig_declarations: "framework_graphics_flags",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+// Display
+java_aconfig_library {
+ name: "display_flags_lib",
+ aconfig_declarations: "display_flags",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+java_aconfig_library {
+ name: "com.android.internal.foldables.flags-aconfig-java",
+ aconfig_declarations: "fold_lock_setting_flags",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+// Multi user
+aconfig_declarations {
+ name: "android.multiuser.flags-aconfig",
+ package: "android.multiuser",
+ srcs: ["core/java/android/content/pm/multiuser.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.multiuser.flags-aconfig-java",
+ aconfig_declarations: "android.multiuser.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+// android.app
+aconfig_declarations {
+ name: "android.app.flags-aconfig",
+ package: "android.app",
+ srcs: ["core/java/android/app/*.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.app.flags-aconfig-java",
+ aconfig_declarations: "android.app.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+// Broadcast Radio
+aconfig_declarations {
+ name: "android.hardware.radio.flags-aconfig",
+ package: "android.hardware.radio",
+ srcs: ["core/java/android/hardware/radio/*.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.hardware.radio.flags-aconfig-java",
+ aconfig_declarations: "android.hardware.radio.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+// Credential Manager
+aconfig_declarations {
+ name: "android.credentials.flags-aconfig",
+ package: "android.credentials.flags",
+ srcs: ["core/java/android/credentials/flags.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.credentials.flags-aconfig-java",
+ aconfig_declarations: "android.credentials.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+// Content Protection
+aconfig_declarations {
+ name: "android.view.contentprotection.flags-aconfig",
+ package: "android.view.contentprotection.flags",
+ srcs: ["core/java/android/view/contentprotection/flags/*.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.view.contentprotection.flags-aconfig-java",
+ aconfig_declarations: "android.view.contentprotection.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+// Pinner Service
+aconfig_declarations {
+ name: "com.android.server.flags.pinner-aconfig",
+ package: "com.android.server.flags",
+ srcs: ["services/core/java/com/android/server/flags/pinner.aconfig"],
+}
+
+java_aconfig_library {
+ name: "com.android.server.flags.pinner-aconfig-java",
+ aconfig_declarations: "com.android.server.flags.pinner-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+// Controls
+aconfig_declarations {
+ name: "android.service.controls.flags-aconfig",
+ package: "android.service.controls.flags",
+ srcs: ["core/java/android/service/controls/flags/*.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.service.controls.flags-aconfig-java",
+ aconfig_declarations: "android.service.controls.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+// Voice
+aconfig_declarations {
+ name: "android.service.voice.flags-aconfig",
+ package: "android.service.voice.flags",
+ srcs: ["core/java/android/service/voice/flags/*.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.service.voice.flags-aconfig-java",
+ aconfig_declarations: "android.service.voice.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+// Autofill
+aconfig_declarations {
+ name: "android.service.autofill.flags-aconfig",
+ package: "android.service.autofill",
+ srcs: [
+ "services/autofill/bugfixes.aconfig",
+ "services/autofill/features.aconfig",
+ ],
+}
+
+java_aconfig_library {
+ name: "android.service.autofill.flags-aconfig-java",
+ aconfig_declarations: "android.service.autofill.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+// Companion
+aconfig_declarations {
+ name: "android.companion.flags-aconfig",
+ package: "android.companion",
+ srcs: ["core/java/android/companion/*.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.companion.flags-aconfig-java",
+ aconfig_declarations: "android.companion.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
// Networking
aconfig_declarations {
name: "com.android.net.flags-aconfig",
@@ -301,6 +742,199 @@
defaults: ["framework-minus-apex-aconfig-java-defaults"],
}
+// DevicePolicy
+aconfig_declarations {
+ name: "device_policy_aconfig_flags",
+ package: "android.app.admin.flags",
+ srcs: [
+ "core/java/android/app/admin/flags/flags.aconfig",
+ ],
+}
+
+java_aconfig_library {
+ name: "device_policy_aconfig_flags_lib",
+ aconfig_declarations: "device_policy_aconfig_flags",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+cc_aconfig_library {
+ name: "device_policy_aconfig_flags_c_lib",
+ aconfig_declarations: "device_policy_aconfig_flags",
+}
+
+// Chooser / "Sharesheet"
+aconfig_declarations {
+ name: "android.service.chooser.flags-aconfig",
+ package: "android.service.chooser",
+ srcs: ["core/java/android/service/chooser/flags.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.service.chooser.flags-aconfig-java",
+ aconfig_declarations: "android.service.chooser.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+// JobScheduler
+aconfig_declarations {
+ name: "framework-jobscheduler-job.flags-aconfig",
+ package: "android.app.job",
+ srcs: ["apex/jobscheduler/framework/aconfig/job.aconfig"],
+}
+
+java_aconfig_library {
+ name: "framework-jobscheduler-job.flags-aconfig-java",
+ aconfig_declarations: "framework-jobscheduler-job.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+// Dreams
+aconfig_declarations {
+ name: "android.service.dreams.flags-aconfig",
+ package: "android.service.dreams",
+ srcs: ["core/java/android/service/dreams/flags.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.service.dreams.flags-aconfig-java",
+ aconfig_declarations: "android.service.dreams.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+// Notifications
+aconfig_declarations {
+ name: "android.service.notification.flags-aconfig",
+ package: "android.service.notification",
+ srcs: ["core/java/android/service/notification/flags.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.service.notification.flags-aconfig-java",
+ aconfig_declarations: "android.service.notification.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+// Smartspace
+aconfig_declarations {
+ name: "android.app.smartspace.flags-aconfig",
+ package: "android.app.smartspace.flags",
+ srcs: ["core/java/android/app/smartspace/flags.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.app.smartspace.flags-aconfig-java",
+ aconfig_declarations: "android.app.smartspace.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+// SurfaceFlinger
+java_aconfig_library {
+ name: "surfaceflinger_flags_java_lib",
+ aconfig_declarations: "surfaceflinger_flags",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+// Content Capture
+aconfig_declarations {
+ name: "android.view.contentcapture.flags-aconfig",
+ package: "android.view.contentcapture.flags",
+ srcs: ["core/java/android/view/contentcapture/flags/*.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.view.contentcapture.flags-aconfig-java",
+ aconfig_declarations: "android.view.contentcapture.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+// USB
+aconfig_declarations {
+ name: "android.hardware.usb.flags-aconfig",
+ package: "android.hardware.usb.flags",
+ srcs: ["core/java/android/hardware/usb/flags/*.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.hardware.usb.flags-aconfig-java",
+ aconfig_declarations: "android.hardware.usb.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+java_aconfig_library {
+ name: "android.hardware.usb.flags-aconfig-java-host",
+ aconfig_declarations: "android.hardware.usb.flags-aconfig",
+ host_supported: true,
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+// WindowingTools
+aconfig_declarations {
+ name: "android.tracing.flags-aconfig",
+ package: "android.tracing",
+ srcs: ["core/java/android/tracing/flags.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.tracing.flags-aconfig-java",
+ aconfig_declarations: "android.tracing.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+// App Widgets
+aconfig_declarations {
+ name: "android.appwidget.flags-aconfig",
+ package: "android.appwidget.flags",
+ srcs: ["core/java/android/appwidget/flags.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.appwidget.flags-aconfig-java",
+ aconfig_declarations: "android.appwidget.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+// App
+aconfig_declarations {
+ name: "android.server.app.flags-aconfig",
+ package: "android.server.app",
+ srcs: ["services/core/java/com/android/server/app/flags.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.server.app.flags-aconfig-java",
+ aconfig_declarations: "android.server.app.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+// WebView
+aconfig_declarations {
+ name: "android.webkit.flags-aconfig",
+ package: "android.webkit",
+ srcs: [
+ "core/java/android/webkit/*.aconfig",
+ "services/core/java/com/android/server/webkit/*.aconfig",
+ ],
+}
+
+java_aconfig_library {
+ name: "android.webkit.flags-aconfig-java",
+ aconfig_declarations: "android.webkit.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
+// Provider
+aconfig_declarations {
+ name: "android.provider.flags-aconfig",
+ package: "android.provider",
+ srcs: ["core/java/android/provider/*.aconfig"],
+}
+
+java_aconfig_library {
+ name: "android.provider.flags-aconfig-java",
+ aconfig_declarations: "android.provider.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
+
// CrashRecovery Module
aconfig_declarations {
name: "android.crashrecovery.flags-aconfig",