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 /services | |
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
Diffstat (limited to 'services')
33 files changed, 34 insertions, 1 deletions
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" |