From 49d1fa359d5792c0890de2132651d04f9575e0f9 Mon Sep 17 00:00:00 2001
From: Chun-Ku Lin <chunkulin@google.com>
Date: Tue, 7 May 2024 02:29:25 +0000
Subject: [PATCH] Use system_ext as the container of the aconfig flags in
 Settings

Bug: 332723689
Test: Run `adb shell printflags` and verify the flags defined in aconfig
folders show up
Flags: EXEMPT aconfig file only changes

Change-Id: If0b497117c303a0bd0b366819c90bd11b41232c3
---
 aconfig/Android.bp                                        | 8 ++++----
 aconfig/accessibility/accessibility_flags.aconfig         | 2 +-
 .../development/settings_core_flag_declarations.aconfig   | 2 +-
 .../factory_reset/factory_reset_flag_declarations.aconfig | 2 +-
 .../media_drm/settings_mediadrm_flag_declarations.aconfig | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/aconfig/Android.bp b/aconfig/Android.bp
index f7b48818093..549ccc712e7 100644
--- a/aconfig/Android.bp
+++ b/aconfig/Android.bp
@@ -20,7 +20,7 @@ java_aconfig_library {
 aconfig_declarations {
     name: "factory_reset_flags",
     package: "com.android.settings.factory_reset",
-    container: "system",
+    container: "system_ext",
     srcs: ["factory_reset/*.aconfig"],
 }
 
@@ -32,7 +32,7 @@ java_aconfig_library {
 aconfig_declarations {
     name: "media_drm_flags",
     package: "com.android.settings.media_drm",
-    container: "system",
+    container: "system_ext",
     srcs: ["media_drm/*.aconfig"],
 }
 
@@ -44,7 +44,7 @@ java_aconfig_library {
 aconfig_declarations {
     name: "accessibility_flags",
     package: "com.android.settings.accessibility",
-    container: "system",
+    container: "system_ext",
     srcs: ["accessibility/*.aconfig"],
 }
 
@@ -56,7 +56,7 @@ java_aconfig_library {
 aconfig_declarations {
     name: "development_settings_flags",
     package: "com.android.settings.development",
-    container: "system",
+    container: "system_ext",
     srcs: [
         "development/**/*.aconfig",
     ],
diff --git a/aconfig/accessibility/accessibility_flags.aconfig b/aconfig/accessibility/accessibility_flags.aconfig
index 691999005cb..c9e1ece1b3a 100644
--- a/aconfig/accessibility/accessibility_flags.aconfig
+++ b/aconfig/accessibility/accessibility_flags.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.settings.accessibility"
-container: "system"
+container: "system_ext"
 
 # NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors.
 
diff --git a/aconfig/development/settings_core_flag_declarations.aconfig b/aconfig/development/settings_core_flag_declarations.aconfig
index fec67f6b782..8a6b055a55c 100644
--- a/aconfig/development/settings_core_flag_declarations.aconfig
+++ b/aconfig/development/settings_core_flag_declarations.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.settings.development"
-container: "system"
+container: "system_ext"
 
 flag {
   name: "a2dp_offload_codec_extensibility_settings"
diff --git a/aconfig/factory_reset/factory_reset_flag_declarations.aconfig b/aconfig/factory_reset/factory_reset_flag_declarations.aconfig
index 7feebf54dcc..dc7d8d4e42a 100644
--- a/aconfig/factory_reset/factory_reset_flag_declarations.aconfig
+++ b/aconfig/factory_reset/factory_reset_flag_declarations.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.settings.factory_reset"
-container: "system"
+container: "system_ext"
 
 flag {
   name: "enable_factory_reset_wizard"
diff --git a/aconfig/media_drm/settings_mediadrm_flag_declarations.aconfig b/aconfig/media_drm/settings_mediadrm_flag_declarations.aconfig
index 4697a11db9c..10579ebd3dd 100644
--- a/aconfig/media_drm/settings_mediadrm_flag_declarations.aconfig
+++ b/aconfig/media_drm/settings_mediadrm_flag_declarations.aconfig
@@ -1,9 +1,9 @@
 package: "com.android.settings.media_drm"
-container: "system"
+container: "system_ext"
 
 flag {
     name: "force_l3_enabled"
     namespace: "media_drm"
     description: "Feature flag of forcing L3"
     bug: "301669353"
-}
\ No newline at end of file
+}