summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dennis Shen <dzshen@google.com> 2024-04-04 19:33:34 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-04-04 19:33:34 +0000
commit33547eef32ce4e1be8110180b73d8aca7015d0c9 (patch)
tree13100987215ed8146cfaaf6d099a1d097009d5cf
parent9199efe94ee31430074c08f492172ba1f291f1f9 (diff)
parent4229f0790df635d310780cc08467d1aca7d66ed4 (diff)
Merge "Add container to .aconfig" into main
-rw-r--r--services/foldables/devicestateprovider/src/com/android/server/policy/feature/Android.bp1
-rw-r--r--services/foldables/devicestateprovider/src/com/android/server/policy/feature/device_state_flags.aconfig1
2 files changed, 2 insertions, 0 deletions
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"