commit 9b828add5e3fddcce23b92b51a568923428773ff
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Jan 24 00:41:19 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 24 00:41:19 2025 -0800
tree 3d6dbb71b7bb9beb1ed4e88206b527ec03d87b21
parent 13bb88e924e31d24c4e5c338ac019276c2917abb
parent cf609ae84499921af11df1f2533d36ca12cfe73a

Merge "Revert "Replace system_ext container with system"" into main

services/foldables/devicestateprovider/src/com/android/server/policy/feature/Android.bp

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 6393e11..1db9e8d 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,7 +1,7 @@
 aconfig_declarations {
     name: "device_state_flags",
     package: "com.android.server.policy.feature.flags",
-    container: "system",
+    container: "system_ext",
     srcs: [
         "device_state_flags.aconfig",
     ],

services/foldables/devicestateprovider/src/com/android/server/policy/feature/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 21e33dd..f827b55 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,5 +1,5 @@
 package: "com.android.server.policy.feature.flags"
-container: "system"
+container: "system_ext"
 
 flag {
     name: "enable_dual_display_blocking"