diff options
author | Oriol Prieto Gasco <opg@google.com> | 2024-04-30 20:05:05 +0000 |
---|---|---|
committer | Oriol Prieto Gascó <opg@google.com> | 2024-05-03 11:42:54 +0000 |
commit | 7b816129bafb07d7a1524f2cb375fb4c6af68eb0 (patch) | |
tree | 48fce6c811e201bea54ff6532eb52c3157691d6f | |
parent | ca3da5d19c2bf7529b289b3e1da3ed45a7db657e (diff) | |
download | base-7b816129bafb07d7a1524f2cb375fb4c6af68eb0.tar.gz |
RESTRICT AUTOMERGE
Set the container field of aconfig flags
Test: printflags --format='{package}:{container}:' | grep "::"
Bug: 312769710
Flag: NONE
Change-Id: I84fda0d5e9813940609436d825738ff786908ff0
115 files changed, 171 insertions, 5 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp index 5f3021664b86..54baae5a886d 100644 --- a/AconfigFlags.bp +++ b/AconfigFlags.bp @@ -141,6 +141,7 @@ cc_aconfig_library { aconfig_declarations { name: "com.android.window.flags.window-aconfig", package: "com.android.window.flags", + container: "system", srcs: ["core/java/android/window/flags/*.aconfig"], } @@ -154,6 +155,7 @@ java_aconfig_library { aconfig_declarations { name: "com.android.hardware.input.input-aconfig", package: "com.android.hardware.input", + container: "system", srcs: ["core/java/android/hardware/input/*.aconfig"], } @@ -173,6 +175,7 @@ java_aconfig_library { aconfig_declarations { name: "com.android.text.flags-aconfig", package: "com.android.text.flags", + container: "system", srcs: ["core/java/android/text/flags/*.aconfig"], } @@ -191,6 +194,7 @@ cc_aconfig_library { aconfig_declarations { name: "android.location.flags-aconfig", package: "android.location.flags", + container: "system", srcs: [ "location/java/android/location/flags/*.aconfig", ], @@ -206,6 +210,7 @@ java_aconfig_library { aconfig_declarations { name: "android.nfc.flags-aconfig", package: "android.nfc", + container: "system", srcs: ["nfc/java/android/nfc/*.aconfig"], } @@ -236,6 +241,7 @@ java_aconfig_library { aconfig_declarations { name: "android.security.flags-aconfig", package: "android.security", + container: "system", srcs: ["core/java/android/security/*.aconfig"], } @@ -256,6 +262,7 @@ java_aconfig_library { aconfig_declarations { name: "android.app.usage.flags-aconfig", package: "android.app.usage", + container: "system", srcs: ["core/java/android/app/usage/*.aconfig"], } @@ -269,6 +276,7 @@ java_aconfig_library { aconfig_declarations { name: "android.os.flags-aconfig", package: "android.os", + container: "system", srcs: ["core/java/android/os/*.aconfig"], } @@ -300,6 +308,7 @@ java_aconfig_library { aconfig_declarations { name: "android.companion.virtualdevice.flags-aconfig", package: "android.companion.virtualdevice.flags", + container: "system", srcs: ["core/java/android/companion/virtual/flags/*.aconfig"], } @@ -312,6 +321,7 @@ java_aconfig_library { aconfig_declarations { name: "android.companion.virtual.flags-aconfig", package: "android.companion.virtual.flags", + container: "system", srcs: ["core/java/android/companion/virtual/*.aconfig"], } @@ -319,6 +329,7 @@ aconfig_declarations { aconfig_declarations { name: "android.view.inputmethod.flags-aconfig", package: "android.view.inputmethod", + container: "system", srcs: ["core/java/android/view/inputmethod/flags.aconfig"], } @@ -332,6 +343,7 @@ java_aconfig_library { aconfig_declarations { name: "android.os.vibrator.flags-aconfig", package: "android.os.vibrator", + container: "system", srcs: ["core/java/android/os/vibrator/*.aconfig"], } @@ -345,6 +357,7 @@ java_aconfig_library { aconfig_declarations { name: "android.view.flags-aconfig", package: "android.view.flags", + container: "system", srcs: ["core/java/android/view/flags/*.aconfig"], } @@ -363,6 +376,7 @@ cc_aconfig_library { aconfig_declarations { name: "android.view.accessibility.flags-aconfig", package: "android.view.accessibility", + container: "system", srcs: ["core/java/android/view/accessibility/flags/*.aconfig"], } @@ -381,6 +395,7 @@ cc_aconfig_library { aconfig_declarations { name: "android.hardware.flags-aconfig", package: "android.hardware.flags", + container: "system", srcs: ["core/java/android/hardware/flags/*.aconfig"], } @@ -394,6 +409,7 @@ java_aconfig_library { aconfig_declarations { name: "android.widget.flags-aconfig", package: "android.widget.flags", + container: "system", srcs: ["core/java/android/widget/flags/*.aconfig"], } @@ -413,6 +429,7 @@ rust_aconfig_library { aconfig_declarations { name: "android.content.pm.flags-aconfig", package: "android.content.pm", + container: "system", srcs: ["core/java/android/content/pm/flags.aconfig"], } @@ -433,6 +450,7 @@ java_aconfig_library { aconfig_declarations { name: "android.content.res.flags-aconfig", package: "android.content.res", + container: "system", srcs: ["core/java/android/content/res/*.aconfig"], } @@ -446,6 +464,7 @@ java_aconfig_library { aconfig_declarations { name: "com.android.media.flags.bettertogether-aconfig", package: "com.android.media.flags", + container: "system", srcs: [ "media/java/android/media/flags/media_better_together.aconfig", "media/java/android/media/flags/fade_manager_configuration.aconfig", @@ -462,6 +481,7 @@ java_aconfig_library { aconfig_declarations { name: "android.media.tv.flags-aconfig", package: "android.media.tv.flags", + container: "system", srcs: ["media/java/android/media/tv/flags/media_tv.aconfig"], } @@ -475,6 +495,7 @@ java_aconfig_library { aconfig_declarations { name: "android.permission.flags-aconfig", package: "android.permission.flags", + container: "system", srcs: ["core/java/android/permission/flags.aconfig"], } @@ -494,6 +515,7 @@ java_aconfig_library { aconfig_declarations { name: "android.database.sqlite-aconfig", package: "android.database.sqlite", + container: "system", srcs: ["core/java/android/database/sqlite/*.aconfig"], } @@ -507,6 +529,7 @@ java_aconfig_library { aconfig_declarations { name: "android.hardware.biometrics.flags-aconfig", package: "android.hardware.biometrics", + container: "system", srcs: ["core/java/android/hardware/biometrics/flags.aconfig"], } @@ -546,6 +569,7 @@ java_aconfig_library { aconfig_declarations { name: "android.multiuser.flags-aconfig", package: "android.multiuser", + container: "system", srcs: ["core/java/android/content/pm/multiuser.aconfig"], } @@ -559,6 +583,7 @@ java_aconfig_library { aconfig_declarations { name: "android.app.flags-aconfig", package: "android.app", + container: "system", srcs: ["core/java/android/app/*.aconfig"], } @@ -572,6 +597,7 @@ java_aconfig_library { aconfig_declarations { name: "android.hardware.radio.flags-aconfig", package: "android.hardware.radio", + container: "system", srcs: ["core/java/android/hardware/radio/*.aconfig"], } @@ -585,6 +611,7 @@ java_aconfig_library { aconfig_declarations { name: "android.credentials.flags-aconfig", package: "android.credentials.flags", + container: "system", srcs: ["core/java/android/credentials/flags.aconfig"], } @@ -598,6 +625,7 @@ java_aconfig_library { aconfig_declarations { name: "android.view.contentprotection.flags-aconfig", package: "android.view.contentprotection.flags", + container: "system", srcs: ["core/java/android/view/contentprotection/flags/*.aconfig"], } @@ -611,6 +639,7 @@ java_aconfig_library { aconfig_declarations { name: "com.android.server.flags.pinner-aconfig", package: "com.android.server.flags", + container: "system", srcs: ["services/core/java/com/android/server/flags/pinner.aconfig"], } @@ -624,6 +653,7 @@ java_aconfig_library { aconfig_declarations { name: "android.service.controls.flags-aconfig", package: "android.service.controls.flags", + container: "system", srcs: ["core/java/android/service/controls/flags/*.aconfig"], } @@ -637,6 +667,7 @@ java_aconfig_library { aconfig_declarations { name: "android.service.voice.flags-aconfig", package: "android.service.voice.flags", + container: "system", srcs: ["core/java/android/service/voice/flags/*.aconfig"], } @@ -650,6 +681,7 @@ java_aconfig_library { aconfig_declarations { name: "android.service.autofill.flags-aconfig", package: "android.service.autofill", + container: "system", srcs: [ "services/autofill/bugfixes.aconfig", "services/autofill/features.aconfig", @@ -666,6 +698,7 @@ java_aconfig_library { aconfig_declarations { name: "android.companion.flags-aconfig", package: "android.companion", + container: "system", srcs: ["core/java/android/companion/*.aconfig"], } @@ -679,6 +712,7 @@ java_aconfig_library { aconfig_declarations { name: "android.net.platform.flags-aconfig", package: "android.net.platform.flags", + container: "system", srcs: ["core/java/android/net/flags.aconfig"], visibility: [":__subpackages__"], } @@ -687,6 +721,7 @@ aconfig_declarations { aconfig_declarations { name: "com.android.net.thread.platform.flags-aconfig", package: "com.android.net.thread.platform.flags", + container: "system", srcs: ["core/java/android/net/thread/flags.aconfig"], } @@ -707,6 +742,7 @@ java_aconfig_library { aconfig_declarations { name: "android.media.playback.flags-aconfig", package: "com.android.media.playback.flags", + container: "system", srcs: ["media/jni/playback_flags.aconfig"], } @@ -725,6 +761,7 @@ java_aconfig_library { aconfig_declarations { name: "android.net.vcn.flags-aconfig", package: "android.net.vcn", + container: "system", srcs: ["core/java/android/net/vcn/*.aconfig"], } @@ -738,6 +775,7 @@ java_aconfig_library { aconfig_declarations { name: "device_policy_aconfig_flags", package: "android.app.admin.flags", + container: "system", srcs: [ "core/java/android/app/admin/flags/flags.aconfig", ], @@ -758,6 +796,7 @@ cc_aconfig_library { aconfig_declarations { name: "android.service.chooser.flags-aconfig", package: "android.service.chooser", + container: "system", srcs: ["core/java/android/service/chooser/flags.aconfig"], } @@ -771,6 +810,7 @@ java_aconfig_library { aconfig_declarations { name: "framework-jobscheduler-job.flags-aconfig", package: "android.app.job", + container: "system", srcs: ["apex/jobscheduler/framework/aconfig/job.aconfig"], } @@ -784,6 +824,7 @@ java_aconfig_library { aconfig_declarations { name: "android.service.dreams.flags-aconfig", package: "android.service.dreams", + container: "system", srcs: ["core/java/android/service/dreams/flags.aconfig"], } @@ -797,6 +838,7 @@ java_aconfig_library { aconfig_declarations { name: "android.service.notification.flags-aconfig", package: "android.service.notification", + container: "system", srcs: ["core/java/android/service/notification/flags.aconfig"], } @@ -810,6 +852,7 @@ java_aconfig_library { aconfig_declarations { name: "android.app.smartspace.flags-aconfig", package: "android.app.smartspace.flags", + container: "system", srcs: ["core/java/android/app/smartspace/flags.aconfig"], } @@ -830,6 +873,7 @@ java_aconfig_library { aconfig_declarations { name: "android.view.contentcapture.flags-aconfig", package: "android.view.contentcapture.flags", + container: "system", srcs: ["core/java/android/view/contentcapture/flags/*.aconfig"], } @@ -843,6 +887,7 @@ java_aconfig_library { aconfig_declarations { name: "android.hardware.usb.flags-aconfig", package: "android.hardware.usb.flags", + container: "system", srcs: ["core/java/android/hardware/usb/flags/*.aconfig"], } @@ -863,6 +908,7 @@ java_aconfig_library { aconfig_declarations { name: "android.tracing.flags-aconfig", package: "android.tracing", + container: "system", srcs: ["core/java/android/tracing/flags.aconfig"], } @@ -876,6 +922,7 @@ java_aconfig_library { aconfig_declarations { name: "android.appwidget.flags-aconfig", package: "android.appwidget.flags", + container: "system", srcs: ["core/java/android/appwidget/flags.aconfig"], } @@ -889,6 +936,7 @@ java_aconfig_library { aconfig_declarations { name: "android.server.app.flags-aconfig", package: "android.server.app", + container: "system", srcs: ["services/core/java/com/android/server/app/flags.aconfig"], } @@ -902,6 +950,7 @@ java_aconfig_library { aconfig_declarations { name: "android.webkit.flags-aconfig", package: "android.webkit", + container: "system", srcs: [ "core/java/android/webkit/*.aconfig", "services/core/java/com/android/server/webkit/*.aconfig", @@ -918,6 +967,7 @@ java_aconfig_library { aconfig_declarations { name: "android.provider.flags-aconfig", package: "android.provider", + container: "system", srcs: ["core/java/android/provider/*.aconfig"], } @@ -931,6 +981,7 @@ java_aconfig_library { aconfig_declarations { name: "android.crashrecovery.flags-aconfig", package: "android.crashrecovery.flags", + container: "system", srcs: ["packages/CrashRecovery/aconfig/flags.aconfig"], } diff --git a/apex/jobscheduler/framework/aconfig/job.aconfig b/apex/jobscheduler/framework/aconfig/job.aconfig index e73b434042af..6dbb96974bd3 100644 --- a/apex/jobscheduler/framework/aconfig/job.aconfig +++ b/apex/jobscheduler/framework/aconfig/job.aconfig @@ -1,4 +1,5 @@ package: "android.app.job" +container: "system" flag { name: "enforce_minimum_time_windows" diff --git a/apex/jobscheduler/service/aconfig/Android.bp b/apex/jobscheduler/service/aconfig/Android.bp index 3ba7aa201d27..7f1fd47afcba 100644 --- a/apex/jobscheduler/service/aconfig/Android.bp +++ b/apex/jobscheduler/service/aconfig/Android.bp @@ -2,6 +2,7 @@ aconfig_declarations { name: "service-deviceidle.flags-aconfig", package: "com.android.server.deviceidle", + container: "system", srcs: [ "device_idle.aconfig", ], @@ -17,6 +18,7 @@ java_aconfig_library { aconfig_declarations { name: "service-job.flags-aconfig", package: "com.android.server.job", + container: "system", srcs: [ "job.aconfig", ], diff --git a/apex/jobscheduler/service/aconfig/device_idle.aconfig b/apex/jobscheduler/service/aconfig/device_idle.aconfig index fc24b3075f14..7a5e4bfd4c4a 100644 --- a/apex/jobscheduler/service/aconfig/device_idle.aconfig +++ b/apex/jobscheduler/service/aconfig/device_idle.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.deviceidle" +container: "system" flag { name: "disable_wakelocks_in_light_idle" diff --git a/apex/jobscheduler/service/aconfig/job.aconfig b/apex/jobscheduler/service/aconfig/job.aconfig index c65e50640ee9..db8124eb0a23 100644 --- a/apex/jobscheduler/service/aconfig/job.aconfig +++ b/apex/jobscheduler/service/aconfig/job.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.job" +container: "system" flag { name: "relax_prefetch_connectivity_constraint_only_on_charger" diff --git a/core/java/android/app/activity_manager.aconfig b/core/java/android/app/activity_manager.aconfig index b303ea64406c..4df67d512b9c 100644 --- a/core/java/android/app/activity_manager.aconfig +++ b/core/java/android/app/activity_manager.aconfig @@ -1,4 +1,5 @@ package: "android.app" +container: "system" flag { namespace: "system_performance" diff --git a/core/java/android/app/admin/flags/flags.aconfig b/core/java/android/app/admin/flags/flags.aconfig index 35ce10223aa6..6600ca9989bb 100644 --- a/core/java/android/app/admin/flags/flags.aconfig +++ b/core/java/android/app/admin/flags/flags.aconfig @@ -1,4 +1,5 @@ package: "android.app.admin.flags" +container: "system" flag { name: "policy_engine_migration_v2_enabled" diff --git a/core/java/android/app/grammatical_inflection_manager.aconfig b/core/java/android/app/grammatical_inflection_manager.aconfig index 989ce61337a3..1a6bb66bd20c 100644 --- a/core/java/android/app/grammatical_inflection_manager.aconfig +++ b/core/java/android/app/grammatical_inflection_manager.aconfig @@ -1,4 +1,5 @@ package: "android.app" +container: "system" flag { name: "system_terms_of_address_enabled" diff --git a/core/java/android/app/network-policy.aconfig b/core/java/android/app/network-policy.aconfig index 88f386f6025d..e7b02a76ef68 100644 --- a/core/java/android/app/network-policy.aconfig +++ b/core/java/android/app/network-policy.aconfig @@ -1,4 +1,5 @@ package: "android.app" +container: "system" flag { namespace: "backstage_power" diff --git a/core/java/android/app/notification.aconfig b/core/java/android/app/notification.aconfig index fb0edb954539..30ae68911378 100644 --- a/core/java/android/app/notification.aconfig +++ b/core/java/android/app/notification.aconfig @@ -1,4 +1,5 @@ package: "android.app" +container: "system" flag { name: "modes_api" diff --git a/core/java/android/app/pinner-client.aconfig b/core/java/android/app/pinner-client.aconfig index b60ad9ee1f8d..1c9b653e3029 100644 --- a/core/java/android/app/pinner-client.aconfig +++ b/core/java/android/app/pinner-client.aconfig @@ -1,4 +1,5 @@ package: "android.app" +container: "system" flag { namespace: "system_performance" diff --git a/core/java/android/app/smartspace/flags.aconfig b/core/java/android/app/smartspace/flags.aconfig index 12af888bfaa5..b763a27c82c8 100644 --- a/core/java/android/app/smartspace/flags.aconfig +++ b/core/java/android/app/smartspace/flags.aconfig @@ -1,4 +1,5 @@ package: "android.app.smartspace.flags" +container: "system" flag { name: "remote_views" diff --git a/core/java/android/app/usage/flags.aconfig b/core/java/android/app/usage/flags.aconfig index a611255c3817..005541c3a8de 100644 --- a/core/java/android/app/usage/flags.aconfig +++ b/core/java/android/app/usage/flags.aconfig @@ -1,4 +1,5 @@ package: "android.app.usage" +container: "system" flag { name: "user_interaction_type_api" diff --git a/core/java/android/appwidget/flags.aconfig b/core/java/android/appwidget/flags.aconfig index c95b864c08bb..d3ac2c830329 100644 --- a/core/java/android/appwidget/flags.aconfig +++ b/core/java/android/appwidget/flags.aconfig @@ -1,4 +1,5 @@ package: "android.appwidget.flags" +container: "system" flag { name: "generated_previews" diff --git a/core/java/android/companion/flags.aconfig b/core/java/android/companion/flags.aconfig index 9e410b86b6bd..cdfd08876241 100644 --- a/core/java/android/companion/flags.aconfig +++ b/core/java/android/companion/flags.aconfig @@ -1,4 +1,5 @@ package: "android.companion" +container: "system" flag { name: "new_association_builder" diff --git a/core/java/android/companion/virtual/flags.aconfig b/core/java/android/companion/virtual/flags.aconfig index ce2490b8efb8..64497d49649a 100644 --- a/core/java/android/companion/virtual/flags.aconfig +++ b/core/java/android/companion/virtual/flags.aconfig @@ -8,6 +8,7 @@ # instead. package: "android.companion.virtual.flags" +container: "system" flag { name: "enable_native_vdm" diff --git a/core/java/android/companion/virtual/flags/flags.aconfig b/core/java/android/companion/virtual/flags/flags.aconfig index d26890faee79..0c35b9d977de 100644 --- a/core/java/android/companion/virtual/flags/flags.aconfig +++ b/core/java/android/companion/virtual/flags/flags.aconfig @@ -14,6 +14,7 @@ # limitations under the License. package: "android.companion.virtualdevice.flags" +container: "system" flag { namespace: "virtual_devices" diff --git a/core/java/android/content/pm/flags.aconfig b/core/java/android/content/pm/flags.aconfig index 7f782abb0d0c..73c685f5b6be 100644 --- a/core/java/android/content/pm/flags.aconfig +++ b/core/java/android/content/pm/flags.aconfig @@ -1,4 +1,5 @@ package: "android.content.pm" +container: "system" flag { name: "quarantined_enabled" diff --git a/core/java/android/content/pm/multiuser.aconfig b/core/java/android/content/pm/multiuser.aconfig index 9a1796fd3d97..b52928799d99 100644 --- a/core/java/android/content/pm/multiuser.aconfig +++ b/core/java/android/content/pm/multiuser.aconfig @@ -1,4 +1,5 @@ package: "android.multiuser" +container: "system" flag { name: "save_global_and_guest_restrictions_on_system_user_xml" diff --git a/core/java/android/content/res/flags.aconfig b/core/java/android/content/res/flags.aconfig index 3a00d91bfb9f..31a1184d6b15 100644 --- a/core/java/android/content/res/flags.aconfig +++ b/core/java/android/content/res/flags.aconfig @@ -1,4 +1,5 @@ package: "android.content.res" +container: "system" flag { name: "default_locale" diff --git a/core/java/android/credentials/flags.aconfig b/core/java/android/credentials/flags.aconfig index f876eebe64c1..fab8e1ab7b2b 100644 --- a/core/java/android/credentials/flags.aconfig +++ b/core/java/android/credentials/flags.aconfig @@ -1,4 +1,5 @@ package: "android.credentials.flags" +container: "system" flag { namespace: "credential_manager" diff --git a/core/java/android/database/sqlite/flags.aconfig b/core/java/android/database/sqlite/flags.aconfig index 62a51236a2e2..899e25fe2f20 100644 --- a/core/java/android/database/sqlite/flags.aconfig +++ b/core/java/android/database/sqlite/flags.aconfig @@ -1,4 +1,5 @@ package: "android.database.sqlite" +container: "system" flag { name: "sqlite_apis_35" diff --git a/core/java/android/hardware/biometrics/flags.aconfig b/core/java/android/hardware/biometrics/flags.aconfig index a7cf71156245..286c1a4c1cae 100644 --- a/core/java/android/hardware/biometrics/flags.aconfig +++ b/core/java/android/hardware/biometrics/flags.aconfig @@ -1,4 +1,5 @@ package: "android.hardware.biometrics" +container: "system" flag { name: "last_authentication_time" diff --git a/core/java/android/hardware/flags/overlayproperties_flags.aconfig b/core/java/android/hardware/flags/overlayproperties_flags.aconfig index c6a352e0fedf..4a81c8022776 100644 --- a/core/java/android/hardware/flags/overlayproperties_flags.aconfig +++ b/core/java/android/hardware/flags/overlayproperties_flags.aconfig @@ -1,4 +1,5 @@ package: "android.hardware.flags" +container: "system" flag { name: "overlayproperties_class_api" diff --git a/core/java/android/hardware/input/input_framework.aconfig b/core/java/android/hardware/input/input_framework.aconfig index 362fe78b14b8..31ea9781a6df 100644 --- a/core/java/android/hardware/input/input_framework.aconfig +++ b/core/java/android/hardware/input/input_framework.aconfig @@ -1,4 +1,5 @@ package: "com.android.hardware.input" +container: "system" # Project link: https://gantry.corp.google.com/projects/android_platform_input_native/changes diff --git a/core/java/android/hardware/radio/flags.aconfig b/core/java/android/hardware/radio/flags.aconfig index dbc1a4b21cfb..90dfd1de9f5a 100644 --- a/core/java/android/hardware/radio/flags.aconfig +++ b/core/java/android/hardware/radio/flags.aconfig @@ -1,4 +1,5 @@ package: "android.hardware.radio" +container: "system" flag { name: "hd_radio_improved" diff --git a/core/java/android/hardware/usb/flags/system_sw_usb_flags.aconfig b/core/java/android/hardware/usb/flags/system_sw_usb_flags.aconfig index 63ae28f6ff9d..3e49af62c5f2 100644 --- a/core/java/android/hardware/usb/flags/system_sw_usb_flags.aconfig +++ b/core/java/android/hardware/usb/flags/system_sw_usb_flags.aconfig @@ -1,4 +1,5 @@ package: "android.hardware.usb.flags" +container: "system" flag { name: "enable_usb_data_compliance_warning" diff --git a/core/java/android/net/flags.aconfig b/core/java/android/net/flags.aconfig index 3544a691cce4..048c50eb0a19 100644 --- a/core/java/android/net/flags.aconfig +++ b/core/java/android/net/flags.aconfig @@ -1,4 +1,5 @@ package: "android.net.platform.flags" +container: "system" # This file contains aconfig flags used from platform code # Flags used for module APIs must be in aconfig files under each modules diff --git a/core/java/android/net/thread/flags.aconfig b/core/java/android/net/thread/flags.aconfig index ef798ad46d2d..afb982ba64ca 100644 --- a/core/java/android/net/thread/flags.aconfig +++ b/core/java/android/net/thread/flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.net.thread.platform.flags" +container: "system" # This file contains aconfig flags used from platform code # Flags used for module APIs must be in aconfig files under each modules diff --git a/core/java/android/net/vcn/flags.aconfig b/core/java/android/net/vcn/flags.aconfig index 6fde39852844..fea2c253e743 100644 --- a/core/java/android/net/vcn/flags.aconfig +++ b/core/java/android/net/vcn/flags.aconfig @@ -1,4 +1,5 @@ package: "android.net.vcn" +container: "system" flag { name: "safe_mode_config" diff --git a/core/java/android/os/flags.aconfig b/core/java/android/os/flags.aconfig index 4468e25743a3..960bda3a223e 100644 --- a/core/java/android/os/flags.aconfig +++ b/core/java/android/os/flags.aconfig @@ -1,4 +1,5 @@ package: "android.os" +container: "system" flag { name: "android_os_build_vanilla_ice_cream" diff --git a/core/java/android/os/vibrator/flags.aconfig b/core/java/android/os/vibrator/flags.aconfig index 437668c9a7de..e47b943d7f8c 100644 --- a/core/java/android/os/vibrator/flags.aconfig +++ b/core/java/android/os/vibrator/flags.aconfig @@ -1,4 +1,5 @@ package: "android.os.vibrator" +container: "system" flag { namespace: "haptics" diff --git a/core/java/android/permission/flags.aconfig b/core/java/android/permission/flags.aconfig index a8ab39164e08..fece5d398750 100644 --- a/core/java/android/permission/flags.aconfig +++ b/core/java/android/permission/flags.aconfig @@ -1,4 +1,5 @@ package: "android.permission.flags" +container: "system" flag { name: "device_aware_permission_apis_enabled" diff --git a/core/java/android/provider/flags.aconfig b/core/java/android/provider/flags.aconfig index 3dd7692cd70d..32a633384106 100644 --- a/core/java/android/provider/flags.aconfig +++ b/core/java/android/provider/flags.aconfig @@ -1,4 +1,5 @@ package: "android.provider" +container: "system" flag { name: "system_settings_default" diff --git a/core/java/android/security/flags.aconfig b/core/java/android/security/flags.aconfig index 6aa956bcdcdd..7d1c86bb2a37 100644 --- a/core/java/android/security/flags.aconfig +++ b/core/java/android/security/flags.aconfig @@ -1,4 +1,5 @@ package: "android.security" +container: "system" flag { name: "certificate_transparency_configuration" diff --git a/core/java/android/security/responsible_apis_flags.aconfig b/core/java/android/security/responsible_apis_flags.aconfig index 0bae459fefc3..85ac16654ffb 100644 --- a/core/java/android/security/responsible_apis_flags.aconfig +++ b/core/java/android/security/responsible_apis_flags.aconfig @@ -1,4 +1,5 @@ package: "android.security" +container: "system" flag { name: "extend_ecm_to_all_settings" diff --git a/core/java/android/service/chooser/flags.aconfig b/core/java/android/service/chooser/flags.aconfig index 597838305a91..38fff0999bce 100644 --- a/core/java/android/service/chooser/flags.aconfig +++ b/core/java/android/service/chooser/flags.aconfig @@ -1,4 +1,5 @@ package: "android.service.chooser" +container: "system" flag { name: "support_nfc_resolver" diff --git a/core/java/android/service/controls/flags/flags.aconfig b/core/java/android/service/controls/flags/flags.aconfig index 3a288440d362..881a0ec9e9f4 100644 --- a/core/java/android/service/controls/flags/flags.aconfig +++ b/core/java/android/service/controls/flags/flags.aconfig @@ -1,4 +1,5 @@ package: "android.service.controls.flags" +container: "system" flag { name: "home_panel_dream" diff --git a/core/java/android/service/dreams/flags.aconfig b/core/java/android/service/dreams/flags.aconfig index 91a713ee6250..2e16a036618d 100644 --- a/core/java/android/service/dreams/flags.aconfig +++ b/core/java/android/service/dreams/flags.aconfig @@ -1,4 +1,5 @@ package: "android.service.dreams" +container: "system" flag { name: "dream_overlay_host" diff --git a/core/java/android/service/notification/flags.aconfig b/core/java/android/service/notification/flags.aconfig index 2a05c847f404..71bee6530fed 100644 --- a/core/java/android/service/notification/flags.aconfig +++ b/core/java/android/service/notification/flags.aconfig @@ -1,4 +1,5 @@ package: "android.service.notification" +container: "system" flag { name: "ranking_update_ashmem" diff --git a/core/java/android/service/voice/flags/flags.aconfig b/core/java/android/service/voice/flags/flags.aconfig index b596666bf607..9a818bff2021 100644 --- a/core/java/android/service/voice/flags/flags.aconfig +++ b/core/java/android/service/voice/flags/flags.aconfig @@ -1,4 +1,5 @@ package: "android.service.voice.flags" +container: "system" flag { name: "allow_training_data_egress_from_hds" diff --git a/core/java/android/text/flags/flags.aconfig b/core/java/android/text/flags/flags.aconfig index a1885ae616e1..946a8c0c5836 100644 --- a/core/java/android/text/flags/flags.aconfig +++ b/core/java/android/text/flags/flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.text.flags" +container: "system" flag { name: "vendor_custom_locale_fallback" diff --git a/core/java/android/tracing/flags.aconfig b/core/java/android/tracing/flags.aconfig index c6e8844bc47a..9e23a4f2bc94 100644 --- a/core/java/android/tracing/flags.aconfig +++ b/core/java/android/tracing/flags.aconfig @@ -1,4 +1,5 @@ package: "android.tracing" +container: "system" flag { name: "perfetto_transition_tracing" diff --git a/core/java/android/view/accessibility/flags/accessibility_flags.aconfig b/core/java/android/view/accessibility/flags/accessibility_flags.aconfig index 0cc19fb70fbc..9e2ba9d2179f 100644 --- a/core/java/android/view/accessibility/flags/accessibility_flags.aconfig +++ b/core/java/android/view/accessibility/flags/accessibility_flags.aconfig @@ -1,4 +1,5 @@ package: "android.view.accessibility" +container: "system" # NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors. diff --git a/core/java/android/view/contentcapture/flags/content_capture_flags.aconfig b/core/java/android/view/contentcapture/flags/content_capture_flags.aconfig index 3c15518419b5..416a877d87ab 100644 --- a/core/java/android/view/contentcapture/flags/content_capture_flags.aconfig +++ b/core/java/android/view/contentcapture/flags/content_capture_flags.aconfig @@ -1,4 +1,5 @@ package: "android.view.contentcapture.flags" +container: "system" flag { name: "run_on_background_thread_enabled" diff --git a/core/java/android/view/contentprotection/flags/content_protection_flags.aconfig b/core/java/android/view/contentprotection/flags/content_protection_flags.aconfig index 2a3008a53635..321a887cd6be 100644 --- a/core/java/android/view/contentprotection/flags/content_protection_flags.aconfig +++ b/core/java/android/view/contentprotection/flags/content_protection_flags.aconfig @@ -1,4 +1,5 @@ package: "android.view.contentprotection.flags" +container: "system" flag { name: "blocklist_update_enabled" diff --git a/core/java/android/view/flags/refresh_rate_flags.aconfig b/core/java/android/view/flags/refresh_rate_flags.aconfig index 0aa516e08697..dd8f5d0e2807 100644 --- a/core/java/android/view/flags/refresh_rate_flags.aconfig +++ b/core/java/android/view/flags/refresh_rate_flags.aconfig @@ -1,4 +1,5 @@ package: "android.view.flags" +container: "system" flag { name: "view_velocity_api" diff --git a/core/java/android/view/flags/scroll_feedback_flags.aconfig b/core/java/android/view/flags/scroll_feedback_flags.aconfig index d1d871c2dbda..3f018f8583be 100644 --- a/core/java/android/view/flags/scroll_feedback_flags.aconfig +++ b/core/java/android/view/flags/scroll_feedback_flags.aconfig @@ -1,4 +1,5 @@ package: "android.view.flags" +container: "system" flag { namespace: "toolkit" diff --git a/core/java/android/view/inputmethod/flags.aconfig b/core/java/android/view/inputmethod/flags.aconfig index dc6aa6cdc048..6f4bf24d0966 100644 --- a/core/java/android/view/inputmethod/flags.aconfig +++ b/core/java/android/view/inputmethod/flags.aconfig @@ -1,4 +1,5 @@ package: "android.view.inputmethod" +container: "system" flag { name: "refactor_insets_controller" diff --git a/core/java/android/widget/flags/differential_motion_fling_flags.aconfig b/core/java/android/widget/flags/differential_motion_fling_flags.aconfig index 79cfe566ac05..a0a391e58dfe 100644 --- a/core/java/android/widget/flags/differential_motion_fling_flags.aconfig +++ b/core/java/android/widget/flags/differential_motion_fling_flags.aconfig @@ -1,4 +1,5 @@ package: "android.widget.flags" +container: "system" flag { namespace: "toolkit" diff --git a/core/java/android/window/flags/accessibility.aconfig b/core/java/android/window/flags/accessibility.aconfig index d467be6e5311..bab9ac9f5196 100644 --- a/core/java/android/window/flags/accessibility.aconfig +++ b/core/java/android/window/flags/accessibility.aconfig @@ -1,4 +1,5 @@ package: "com.android.window.flags" +container: "system" flag { name: "do_not_check_intersection_when_non_magnifiable_window_transitions" diff --git a/core/java/android/window/flags/large_screen_experiences_app_compat.aconfig b/core/java/android/window/flags/large_screen_experiences_app_compat.aconfig index 727bff44017e..d4bf2edf7094 100644 --- a/core/java/android/window/flags/large_screen_experiences_app_compat.aconfig +++ b/core/java/android/window/flags/large_screen_experiences_app_compat.aconfig @@ -1,4 +1,5 @@ package: "com.android.window.flags" +container: "system" flag { name: "allows_screen_size_decoupled_from_status_bar_and_cutout" diff --git a/core/java/android/window/flags/responsible_apis.aconfig b/core/java/android/window/flags/responsible_apis.aconfig index ad0e9a487c53..d0870d37a622 100644 --- a/core/java/android/window/flags/responsible_apis.aconfig +++ b/core/java/android/window/flags/responsible_apis.aconfig @@ -1,4 +1,5 @@ package: "com.android.window.flags" +container: "system" flag { name: "bal_require_opt_in_by_pending_intent_creator" diff --git a/core/java/android/window/flags/wallpaper_manager.aconfig b/core/java/android/window/flags/wallpaper_manager.aconfig index f03c993a9c66..a8645abdb9b6 100644 --- a/core/java/android/window/flags/wallpaper_manager.aconfig +++ b/core/java/android/window/flags/wallpaper_manager.aconfig @@ -1,4 +1,5 @@ package: "com.android.window.flags" +container: "system" flag { name: "always_update_wallpaper_permission" diff --git a/core/java/android/window/flags/window_surfaces.aconfig b/core/java/android/window/flags/window_surfaces.aconfig index 56df49370379..6c6daf8318b4 100644 --- a/core/java/android/window/flags/window_surfaces.aconfig +++ b/core/java/android/window/flags/window_surfaces.aconfig @@ -1,4 +1,5 @@ package: "com.android.window.flags" +container: "system" # Project link: https://gantry.corp.google.com/projects/android_platform_window_surfaces/changes diff --git a/core/java/android/window/flags/windowing_frontend.aconfig b/core/java/android/window/flags/windowing_frontend.aconfig index 07beb114898d..af6105de1408 100644 --- a/core/java/android/window/flags/windowing_frontend.aconfig +++ b/core/java/android/window/flags/windowing_frontend.aconfig @@ -1,4 +1,5 @@ package: "com.android.window.flags" +container: "system" flag { name: "nav_bar_transparent_by_default" diff --git a/core/java/android/window/flags/windowing_sdk.aconfig b/core/java/android/window/flags/windowing_sdk.aconfig index 933cc49f8602..7688c1775c2f 100644 --- a/core/java/android/window/flags/windowing_sdk.aconfig +++ b/core/java/android/window/flags/windowing_sdk.aconfig @@ -1,4 +1,5 @@ package: "com.android.window.flags" +container: "system" # Project link: https://gantry.corp.google.com/projects/android_platform_windowing_sdk/changes diff --git a/core/java/com/android/internal/foldables/Android.bp b/core/java/com/android/internal/foldables/Android.bp index f1d06da98186..53a9be5fdb0e 100644 --- a/core/java/com/android/internal/foldables/Android.bp +++ b/core/java/com/android/internal/foldables/Android.bp @@ -1,6 +1,7 @@ aconfig_declarations { name: "fold_lock_setting_flags", package: "com.android.internal.foldables.flags", + container: "system", srcs: [ "fold_lock_setting_flags.aconfig", ], diff --git a/core/java/com/android/internal/foldables/fold_lock_setting_flags.aconfig b/core/java/com/android/internal/foldables/fold_lock_setting_flags.aconfig index 44f436eaaa19..c00a2b57c32d 100644 --- a/core/java/com/android/internal/foldables/fold_lock_setting_flags.aconfig +++ b/core/java/com/android/internal/foldables/fold_lock_setting_flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.internal.foldables.flags" +container: "system" flag { name: "fold_lock_setting_enabled" diff --git a/graphics/java/Android.bp b/graphics/java/Android.bp index db37a38756d2..0937f1482ef6 100644 --- a/graphics/java/Android.bp +++ b/graphics/java/Android.bp @@ -10,6 +10,7 @@ package { aconfig_declarations { name: "framework_graphics_flags", package: "com.android.graphics.flags", + container: "system", srcs: ["android/framework_graphics.aconfig"], } diff --git a/graphics/java/android/framework_graphics.aconfig b/graphics/java/android/framework_graphics.aconfig index 6c81a608241c..f13f3698f9f6 100644 --- a/graphics/java/android/framework_graphics.aconfig +++ b/graphics/java/android/framework_graphics.aconfig @@ -1,4 +1,5 @@ package: "com.android.graphics.flags" +container: "system" flag { name: "exact_compute_bounds" diff --git a/libs/WindowManager/Shell/aconfig/Android.bp b/libs/WindowManager/Shell/aconfig/Android.bp index 1a98ffcea9e7..3891eebbc01f 100644 --- a/libs/WindowManager/Shell/aconfig/Android.bp +++ b/libs/WindowManager/Shell/aconfig/Android.bp @@ -1,6 +1,7 @@ aconfig_declarations { name: "com_android_wm_shell_flags", package: "com.android.wm.shell", + container: "system", srcs: [ "multitasking.aconfig", ], @@ -9,4 +10,4 @@ aconfig_declarations { java_aconfig_library { name: "com_android_wm_shell_flags_lib", aconfig_declarations: "com_android_wm_shell_flags", -}
\ No newline at end of file +} diff --git a/libs/WindowManager/Shell/aconfig/multitasking.aconfig b/libs/WindowManager/Shell/aconfig/multitasking.aconfig index 4511f3b91c5c..c0ecb8d78f5e 100644 --- a/libs/WindowManager/Shell/aconfig/multitasking.aconfig +++ b/libs/WindowManager/Shell/aconfig/multitasking.aconfig @@ -1,4 +1,5 @@ package: "com.android.wm.shell" +container: "system" flag { name: "example_flag" diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp index 14e865366371..656cb12a61df 100644 --- a/libs/hwui/Android.bp +++ b/libs/hwui/Android.bp @@ -31,6 +31,7 @@ license { aconfig_declarations { name: "hwui_flags", package: "com.android.graphics.hwui.flags", + container: "system", srcs: [ "aconfig/hwui_flags.aconfig", ], diff --git a/libs/hwui/aconfig/hwui_flags.aconfig b/libs/hwui/aconfig/hwui_flags.aconfig index ca119757e816..920add5e0406 100644 --- a/libs/hwui/aconfig/hwui_flags.aconfig +++ b/libs/hwui/aconfig/hwui_flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.graphics.hwui.flags" +container: "system" flag { name: "matrix_44" diff --git a/location/java/android/location/flags/gnss.aconfig b/location/java/android/location/flags/gnss.aconfig index b6055e818f8c..a3412de3ab15 100644 --- a/location/java/android/location/flags/gnss.aconfig +++ b/location/java/android/location/flags/gnss.aconfig @@ -1,4 +1,5 @@ package: "android.location.flags" +container: "system" flag { name: "gnss_api_navic_l1" diff --git a/media/java/android/media/flags/fade_manager_configuration.aconfig b/media/java/android/media/flags/fade_manager_configuration.aconfig index 100e2235a7a8..1f663dcaac45 100644 --- a/media/java/android/media/flags/fade_manager_configuration.aconfig +++ b/media/java/android/media/flags/fade_manager_configuration.aconfig @@ -1,4 +1,5 @@ package: "com.android.media.flags" +container: "system" flag { namespace: "media_solutions" diff --git a/media/java/android/media/flags/media_better_together.aconfig b/media/java/android/media/flags/media_better_together.aconfig index 07f63e5441af..5276d22ecc78 100644 --- a/media/java/android/media/flags/media_better_together.aconfig +++ b/media/java/android/media/flags/media_better_together.aconfig @@ -1,4 +1,5 @@ package: "com.android.media.flags" +container: "system" flag { name: "enable_rlp_callbacks_in_media_router2" diff --git a/media/java/android/media/tv/flags/media_tv.aconfig b/media/java/android/media/tv/flags/media_tv.aconfig index 018eaf6dc32f..baffb001e49b 100644 --- a/media/java/android/media/tv/flags/media_tv.aconfig +++ b/media/java/android/media/tv/flags/media_tv.aconfig @@ -1,4 +1,5 @@ package: "android.media.tv.flags" +container: "system" flag { name: "broadcast_visibility_types" diff --git a/media/jni/playback_flags.aconfig b/media/jni/playback_flags.aconfig index 2bb0ec5375fd..9d927eccc596 100644 --- a/media/jni/playback_flags.aconfig +++ b/media/jni/playback_flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.media.playback.flags" +container: "system" flag { name: "mediametadataretriever_default_rgba8888" diff --git a/nfc/java/android/nfc/flags.aconfig b/nfc/java/android/nfc/flags.aconfig index 5879595b00b7..4a6f26a849ed 100644 --- a/nfc/java/android/nfc/flags.aconfig +++ b/nfc/java/android/nfc/flags.aconfig @@ -1,4 +1,5 @@ package: "android.nfc" +container: "system" flag { name: "enable_nfc_mainline" diff --git a/packages/SettingsLib/Android.bp b/packages/SettingsLib/Android.bp index 1e49330956fd..91ac8fc77c2b 100644 --- a/packages/SettingsLib/Android.bp +++ b/packages/SettingsLib/Android.bp @@ -75,6 +75,7 @@ java_defaults { aconfig_declarations { name: "settingslib_media_flags", package: "com.android.settingslib.media.flags", + container: "system", srcs: [ "aconfig/settingslib_media_flag_declarations.aconfig", ], diff --git a/packages/SettingsLib/aconfig/settingslib_media_flag_declarations.aconfig b/packages/SettingsLib/aconfig/settingslib_media_flag_declarations.aconfig index f3e537b33230..4d70aec9fa5c 100644 --- a/packages/SettingsLib/aconfig/settingslib_media_flag_declarations.aconfig +++ b/packages/SettingsLib/aconfig/settingslib_media_flag_declarations.aconfig @@ -1,4 +1,5 @@ package: "com.android.settingslib.media.flags" +container: "system" flag { name: "use_media_router2_for_info_media_manager" diff --git a/packages/SettingsProvider/Android.bp b/packages/SettingsProvider/Android.bp index adebdcdcf26a..cfe664e1156d 100644 --- a/packages/SettingsProvider/Android.bp +++ b/packages/SettingsProvider/Android.bp @@ -83,6 +83,7 @@ android_test { aconfig_declarations { name: "device_config_service_flags", package: "com.android.providers.settings", + container: "system", srcs: [ "src/com/android/providers/settings/device_config_service.aconfig", ], diff --git a/packages/SettingsProvider/src/com/android/providers/settings/device_config_service.aconfig b/packages/SettingsProvider/src/com/android/providers/settings/device_config_service.aconfig index 27ce0d4c7252..b3ed1e915e9d 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/device_config_service.aconfig +++ b/packages/SettingsProvider/src/com/android/providers/settings/device_config_service.aconfig @@ -1,4 +1,5 @@ package: "com.android.providers.settings" +container: "system" flag { name: "support_overrides" diff --git a/packages/SystemUI/accessibility/accessibilitymenu/aconfig/Android.bp b/packages/SystemUI/accessibility/accessibilitymenu/aconfig/Android.bp index 6d63409ffc06..ff75d8c8acba 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/aconfig/Android.bp +++ b/packages/SystemUI/accessibility/accessibilitymenu/aconfig/Android.bp @@ -1,6 +1,7 @@ aconfig_declarations { name: "com_android_a11y_menu_flags", package: "com.android.systemui.accessibility.accessibilitymenu", + container: "system", srcs: [ "accessibility.aconfig", ], diff --git a/packages/SystemUI/accessibility/accessibilitymenu/aconfig/accessibility.aconfig b/packages/SystemUI/accessibility/accessibilitymenu/aconfig/accessibility.aconfig index eadcd7c27a18..6ad1b3819fa8 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/aconfig/accessibility.aconfig +++ b/packages/SystemUI/accessibility/accessibilitymenu/aconfig/accessibility.aconfig @@ -1,4 +1,5 @@ package: "com.android.systemui.accessibility.accessibilitymenu" +container: "system" # NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors. diff --git a/packages/SystemUI/aconfig/Android.bp b/packages/SystemUI/aconfig/Android.bp index 50ed7ab7c85a..b09d1da35f70 100644 --- a/packages/SystemUI/aconfig/Android.bp +++ b/packages/SystemUI/aconfig/Android.bp @@ -23,13 +23,14 @@ package { default_visibility: [ "//visibility:override", "//frameworks/base/packages/SystemUI:__subpackages__", - "//platform_testing:__subpackages__" + "//platform_testing:__subpackages__", ], } aconfig_declarations { name: "com_android_systemui_flags", package: "com.android.systemui", + container: "system", srcs: [ "*.aconfig", ], diff --git a/packages/SystemUI/aconfig/accessibility.aconfig b/packages/SystemUI/aconfig/accessibility.aconfig index 21263a92ae26..97bf8d81c975 100644 --- a/packages/SystemUI/aconfig/accessibility.aconfig +++ b/packages/SystemUI/aconfig/accessibility.aconfig @@ -1,4 +1,5 @@ package: "com.android.systemui" +container: "system" # NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors. @@ -28,4 +29,4 @@ flag { namespace: "accessibility" description: "Animates the floating menu's transition between curved and jagged edges." bug: "281140482" -}
\ No newline at end of file +} diff --git a/packages/SystemUI/aconfig/biometrics_framework.aconfig b/packages/SystemUI/aconfig/biometrics_framework.aconfig index 5fd3b485e9ed..e6c6974b2de2 100644 --- a/packages/SystemUI/aconfig/biometrics_framework.aconfig +++ b/packages/SystemUI/aconfig/biometrics_framework.aconfig @@ -1,4 +1,5 @@ package: "com.android.systemui" +container: "system" # NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors. @@ -7,4 +8,4 @@ flag { namespace: "biometrics_framework" description: "Adds talkback directional guidance when using UDFPS with biometric prompt" bug: "310044658" -}
\ No newline at end of file +} diff --git a/packages/SystemUI/aconfig/communal.aconfig b/packages/SystemUI/aconfig/communal.aconfig index 2c6ff979cc7f..2e9af7e3a763 100644 --- a/packages/SystemUI/aconfig/communal.aconfig +++ b/packages/SystemUI/aconfig/communal.aconfig @@ -1,4 +1,5 @@ package: "com.android.systemui" +container: "system" flag { name: "communal_hub" diff --git a/packages/SystemUI/aconfig/systemui.aconfig b/packages/SystemUI/aconfig/systemui.aconfig index facb244a5489..27977c0ade0e 100644 --- a/packages/SystemUI/aconfig/systemui.aconfig +++ b/packages/SystemUI/aconfig/systemui.aconfig @@ -1,4 +1,5 @@ package: "com.android.systemui" +container: "system" flag { name: "example_flag" diff --git a/services/accessibility/Android.bp b/services/accessibility/Android.bp index e2488a51bba1..898b7d651155 100644 --- a/services/accessibility/Android.bp +++ b/services/accessibility/Android.bp @@ -54,6 +54,7 @@ java_library_static { aconfig_declarations { name: "com_android_server_accessibility_flags", package: "com.android.server.accessibility", + container: "system", srcs: [ "accessibility.aconfig", ], diff --git a/services/accessibility/accessibility.aconfig b/services/accessibility/accessibility.aconfig index a19920f4fc02..f54610a7e815 100644 --- a/services/accessibility/accessibility.aconfig +++ b/services/accessibility/accessibility.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.accessibility" +container: "system" # NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors. diff --git a/services/autofill/bugfixes.aconfig b/services/autofill/bugfixes.aconfig index b5130a1c4cfc..e0d67e82e262 100644 --- a/services/autofill/bugfixes.aconfig +++ b/services/autofill/bugfixes.aconfig @@ -1,4 +1,5 @@ package: "android.service.autofill" +container: "system" flag { name: "test" diff --git a/services/autofill/features.aconfig b/services/autofill/features.aconfig index 92e00ee0a477..eef116325e67 100644 --- a/services/autofill/features.aconfig +++ b/services/autofill/features.aconfig @@ -1,4 +1,5 @@ package: "android.service.autofill" +container: "system" flag { name: "autofill_credman_integration" diff --git a/services/backup/Android.bp b/services/backup/Android.bp index d08a97e2a573..dd36b253354e 100644 --- a/services/backup/Android.bp +++ b/services/backup/Android.bp @@ -31,6 +31,7 @@ java_library_static { aconfig_declarations { name: "backup_flags", package: "com.android.server.backup", + container: "system", srcs: ["flags.aconfig"], } diff --git a/services/backup/flags.aconfig b/services/backup/flags.aconfig index d695d36db0ea..2186169fd802 100644 --- a/services/backup/flags.aconfig +++ b/services/backup/flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.backup" +container: "system" flag { name: "enable_skipping_restore_launched_apps" diff --git a/services/companion/java/com/android/server/companion/virtual/Android.bp b/services/companion/java/com/android/server/companion/virtual/Android.bp index 6526c78d5124..1d00e9bb6c24 100644 --- a/services/companion/java/com/android/server/companion/virtual/Android.bp +++ b/services/companion/java/com/android/server/companion/virtual/Android.bp @@ -6,6 +6,7 @@ java_aconfig_library { aconfig_declarations { name: "virtualdevice_flags", package: "com.android.server.companion.virtual", + container: "system", srcs: [ "flags.aconfig", ], diff --git a/services/companion/java/com/android/server/companion/virtual/flags.aconfig b/services/companion/java/com/android/server/companion/virtual/flags.aconfig index 6297e91e8705..616f5d09e13f 100644 --- a/services/companion/java/com/android/server/companion/virtual/flags.aconfig +++ b/services/companion/java/com/android/server/companion/virtual/flags.aconfig @@ -1,6 +1,7 @@ # OLD PACKAGE, DO NOT USE: Prefer `flags.aconfig` in core/java/android/companion/virtual # (or other custom files) to define your flags package: "com.android.server.companion.virtual" +container: "system" flag { name: "dump_history" diff --git a/services/core/java/com/android/server/am/Android.bp b/services/core/java/com/android/server/am/Android.bp index af1200e4bdf8..0294ffe6e151 100644 --- a/services/core/java/com/android/server/am/Android.bp +++ b/services/core/java/com/android/server/am/Android.bp @@ -1,6 +1,7 @@ aconfig_declarations { name: "am_flags", package: "com.android.server.am", + container: "system", srcs: ["*.aconfig"], } diff --git a/services/core/java/com/android/server/am/flags.aconfig b/services/core/java/com/android/server/am/flags.aconfig index c666915ddca5..46e197e8a4de 100644 --- a/services/core/java/com/android/server/am/flags.aconfig +++ b/services/core/java/com/android/server/am/flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.am" +container: "system" flag { name: "oomadjuster_correctness_rewrite" diff --git a/services/core/java/com/android/server/app/flags.aconfig b/services/core/java/com/android/server/app/flags.aconfig index f2e4783bd9eb..a5a68de23f9e 100644 --- a/services/core/java/com/android/server/app/flags.aconfig +++ b/services/core/java/com/android/server/app/flags.aconfig @@ -1,4 +1,5 @@ package: "android.server.app" +container: "system" flag { name: "game_default_frame_rate" diff --git a/services/core/java/com/android/server/biometrics/Android.bp b/services/core/java/com/android/server/biometrics/Android.bp index 6cbe4adbcdbe..ed5de0305863 100644 --- a/services/core/java/com/android/server/biometrics/Android.bp +++ b/services/core/java/com/android/server/biometrics/Android.bp @@ -1,6 +1,7 @@ aconfig_declarations { name: "biometrics_flags", package: "com.android.server.biometrics", + container: "system", srcs: [ "biometrics.aconfig", ], diff --git a/services/core/java/com/android/server/biometrics/biometrics.aconfig b/services/core/java/com/android/server/biometrics/biometrics.aconfig index b12d831ffe24..7a9491e44cd7 100644 --- a/services/core/java/com/android/server/biometrics/biometrics.aconfig +++ b/services/core/java/com/android/server/biometrics/biometrics.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.biometrics" +container: "system" flag { name: "face_vhal_feature" diff --git a/services/core/java/com/android/server/connectivity/Android.bp b/services/core/java/com/android/server/connectivity/Android.bp index a374ec2cea9a..0916594631fd 100644 --- a/services/core/java/com/android/server/connectivity/Android.bp +++ b/services/core/java/com/android/server/connectivity/Android.bp @@ -1,6 +1,7 @@ aconfig_declarations { name: "connectivity_flags", package: "com.android.server.connectivity", + container: "system", srcs: ["flags.aconfig"], } diff --git a/services/core/java/com/android/server/connectivity/flags.aconfig b/services/core/java/com/android/server/connectivity/flags.aconfig index 32593d4bcdaa..bc240d4e7561 100644 --- a/services/core/java/com/android/server/connectivity/flags.aconfig +++ b/services/core/java/com/android/server/connectivity/flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.connectivity" +container: "system" flag { name: "replace_vpn_profile_store" diff --git a/services/core/java/com/android/server/display/feature/Android.bp b/services/core/java/com/android/server/display/feature/Android.bp index a0ead384c1d2..daf8832fd1d7 100644 --- a/services/core/java/com/android/server/display/feature/Android.bp +++ b/services/core/java/com/android/server/display/feature/Android.bp @@ -1,6 +1,7 @@ aconfig_declarations { name: "display_flags", package: "com.android.server.display.feature.flags", + container: "system", srcs: [ "*.aconfig", ], diff --git a/services/core/java/com/android/server/display/feature/display_flags.aconfig b/services/core/java/com/android/server/display/feature/display_flags.aconfig index 7a723a3290a9..de677026f173 100644 --- a/services/core/java/com/android/server/display/feature/display_flags.aconfig +++ b/services/core/java/com/android/server/display/feature/display_flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.display.feature.flags" +container: "system" # Important: Flags must be accessed through DisplayManagerFlags. diff --git a/services/core/java/com/android/server/feature/Android.bp b/services/core/java/com/android/server/feature/Android.bp index 067288d6650d..b0fbab6657b0 100644 --- a/services/core/java/com/android/server/feature/Android.bp +++ b/services/core/java/com/android/server/feature/Android.bp @@ -1,6 +1,7 @@ aconfig_declarations { name: "dropbox_flags", package: "com.android.server.feature.flags", + container: "system", srcs: [ "dropbox_flags.aconfig", ], diff --git a/services/core/java/com/android/server/feature/dropbox_flags.aconfig b/services/core/java/com/android/server/feature/dropbox_flags.aconfig index fee4bf377ddc..b43d35a16f90 100644 --- a/services/core/java/com/android/server/feature/dropbox_flags.aconfig +++ b/services/core/java/com/android/server/feature/dropbox_flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.feature.flags" +container: "system" flag{ name: "enable_read_dropbox_permission" diff --git a/services/core/java/com/android/server/flags/pinner.aconfig b/services/core/java/com/android/server/flags/pinner.aconfig index 606a6be29511..16a45cd87fd7 100644 --- a/services/core/java/com/android/server/flags/pinner.aconfig +++ b/services/core/java/com/android/server/flags/pinner.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.flags" +container: "system" flag { name: "pin_webview" diff --git a/services/core/java/com/android/server/net/Android.bp b/services/core/java/com/android/server/net/Android.bp index 71d8e6ba367e..3ac2d232dfc8 100644 --- a/services/core/java/com/android/server/net/Android.bp +++ b/services/core/java/com/android/server/net/Android.bp @@ -1,6 +1,7 @@ aconfig_declarations { name: "net_flags", package: "com.android.server.net", + container: "system", srcs: ["*.aconfig"], } diff --git a/services/core/java/com/android/server/net/flags.aconfig b/services/core/java/com/android/server/net/flags.aconfig index 419665a0a5ab..d9491de52d87 100644 --- a/services/core/java/com/android/server/net/flags.aconfig +++ b/services/core/java/com/android/server/net/flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.net" +container: "system" flag { name: "network_blocked_for_top_sleeping_and_above" diff --git a/services/core/java/com/android/server/notification/Android.bp b/services/core/java/com/android/server/notification/Android.bp index f26a25b63207..951241892994 100644 --- a/services/core/java/com/android/server/notification/Android.bp +++ b/services/core/java/com/android/server/notification/Android.bp @@ -6,7 +6,8 @@ java_aconfig_library { aconfig_declarations { name: "notification_flags", package: "com.android.server.notification", + container: "system", srcs: [ "flags.aconfig", ], -}
\ No newline at end of file +} diff --git a/services/core/java/com/android/server/notification/flags.aconfig b/services/core/java/com/android/server/notification/flags.aconfig index da017453ed8b..efc9d9fd70b7 100644 --- a/services/core/java/com/android/server/notification/flags.aconfig +++ b/services/core/java/com/android/server/notification/flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.notification" +container: "system" flag { name: "expire_bitmaps" diff --git a/services/core/java/com/android/server/os/Android.bp b/services/core/java/com/android/server/os/Android.bp index 565dc3b644ea..c5886708ad85 100644 --- a/services/core/java/com/android/server/os/Android.bp +++ b/services/core/java/com/android/server/os/Android.bp @@ -1,6 +1,7 @@ aconfig_declarations { name: "core_os_flags", package: "com.android.server.os", + container: "system", srcs: [ "*.aconfig", ], diff --git a/services/core/java/com/android/server/os/core_os_flags.aconfig b/services/core/java/com/android/server/os/core_os_flags.aconfig index cbc0d54046df..ae33df83e3aa 100644 --- a/services/core/java/com/android/server/os/core_os_flags.aconfig +++ b/services/core/java/com/android/server/os/core_os_flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.os" +container: "system" flag { name: "proto_tombstone" diff --git a/services/core/java/com/android/server/power/Android.bp b/services/core/java/com/android/server/power/Android.bp index 607d435b5410..46f03f26c89e 100644 --- a/services/core/java/com/android/server/power/Android.bp +++ b/services/core/java/com/android/server/power/Android.bp @@ -1,6 +1,7 @@ aconfig_declarations { name: "backstage_power_flags", package: "com.android.server.power.optimization", + container: "system", srcs: [ "stats/*.aconfig", ], diff --git a/services/core/java/com/android/server/power/stats/flags.aconfig b/services/core/java/com/android/server/power/stats/flags.aconfig index 0f135715ebc3..4c542140d279 100644 --- a/services/core/java/com/android/server/power/stats/flags.aconfig +++ b/services/core/java/com/android/server/power/stats/flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.power.optimization" +container: "system" flag { name: "power_monitor_api" diff --git a/services/core/java/com/android/server/utils/Android.bp b/services/core/java/com/android/server/utils/Android.bp index 3a334bee93ff..ffb9aec1cbef 100644 --- a/services/core/java/com/android/server/utils/Android.bp +++ b/services/core/java/com/android/server/utils/Android.bp @@ -1,6 +1,7 @@ aconfig_declarations { name: "com.android.server.utils-aconfig", package: "com.android.server.utils", + container: "system", srcs: ["*.aconfig"], } diff --git a/services/core/java/com/android/server/utils/flags.aconfig b/services/core/java/com/android/server/utils/flags.aconfig index 489e21ab06ca..0eb151073f46 100644 --- a/services/core/java/com/android/server/utils/flags.aconfig +++ b/services/core/java/com/android/server/utils/flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.utils" +container: "system" flag { name: "anr_timer_service_enabled" diff --git a/services/core/java/com/android/server/webkit/flags.aconfig b/services/core/java/com/android/server/webkit/flags.aconfig index 1411acc4ab84..3d30e74d63bc 100644 --- a/services/core/java/com/android/server/webkit/flags.aconfig +++ b/services/core/java/com/android/server/webkit/flags.aconfig @@ -1,4 +1,5 @@ package: "android.webkit" +container: "system" flag { name: "update_service_v2" diff --git a/services/foldables/devicestateprovider/src/com/android/server/policy/feature/Android.bp b/services/foldables/devicestateprovider/src/com/android/server/policy/feature/Android.bp index 6ad8d790485c..6393e11b7432 100644 --- a/services/foldables/devicestateprovider/src/com/android/server/policy/feature/Android.bp +++ b/services/foldables/devicestateprovider/src/com/android/server/policy/feature/Android.bp @@ -1,6 +1,7 @@ aconfig_declarations { name: "device_state_flags", package: "com.android.server.policy.feature.flags", + container: "system", srcs: [ "device_state_flags.aconfig", ], diff --git a/services/foldables/devicestateprovider/src/com/android/server/policy/feature/device_state_flags.aconfig b/services/foldables/devicestateprovider/src/com/android/server/policy/feature/device_state_flags.aconfig index 29e258cc90ff..21e33dd1b99a 100644 --- a/services/foldables/devicestateprovider/src/com/android/server/policy/feature/device_state_flags.aconfig +++ b/services/foldables/devicestateprovider/src/com/android/server/policy/feature/device_state_flags.aconfig @@ -1,4 +1,5 @@ package: "com.android.server.policy.feature.flags" +container: "system" flag { name: "enable_dual_display_blocking" |