diff options
| author | 2025-01-24 00:48:03 -0800 | |
|---|---|---|
| committer | 2025-01-24 00:48:03 -0800 | |
| commit | 12ec892c855adbe4d45e12f07cbd5ae084345d0f (patch) | |
| tree | 3d6dbb71b7bb9beb1ed4e88206b527ec03d87b21 | |
| parent | e92786fe20000f18b66b542815d0c1108fd7aff5 (diff) | |
| parent | 9b828add5e3fddcce23b92b51a568923428773ff (diff) | |
Merge "Revert "Replace system_ext container with system"" into main am: 9b828add5e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3463704
Change-Id: I3406983cf50892717fce98faa390e0d39462537f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2 files changed, 2 insertions, 2 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 6393e11b7432..1db9e8d545e4 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", ], 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 21e33dd1b99a..f827b5508015 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" |