PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use system_ext as the container of the aconfig flags in Settings" into main

Browse Source
This commit is contained in:
Chun-Ku Lin
2024-05-07 18:42:53 +00:00
committed by Android (Google) Code Review
parent ff99e1f72f 49d1fa359d
commit 3e4247ad9a
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
aconfig/Android.bp
View File

@@ -20,7 +20,7 @@ java_aconfig_library {
aconfig_declarations { aconfig_declarations {
name: "factory_reset_flags", name: "factory_reset_flags",
package: "com.android.settings.factory_reset", package: "com.android.settings.factory_reset",
container: "system", container: "system_ext",
srcs: ["factory_reset/*.aconfig"], srcs: ["factory_reset/*.aconfig"],
} }
@@ -32,7 +32,7 @@ java_aconfig_library {
aconfig_declarations { aconfig_declarations {
name: "media_drm_flags", name: "media_drm_flags",
package: "com.android.settings.media_drm", package: "com.android.settings.media_drm",
container: "system", container: "system_ext",
srcs: ["media_drm/*.aconfig"], srcs: ["media_drm/*.aconfig"],
} }
@@ -44,7 +44,7 @@ java_aconfig_library {
aconfig_declarations { aconfig_declarations {
name: "accessibility_flags", name: "accessibility_flags",
package: "com.android.settings.accessibility", package: "com.android.settings.accessibility",
container: "system", container: "system_ext",
srcs: ["accessibility/*.aconfig"], srcs: ["accessibility/*.aconfig"],
} }
@@ -56,7 +56,7 @@ java_aconfig_library {
aconfig_declarations { aconfig_declarations {
name: "development_settings_flags", name: "development_settings_flags",
package: "com.android.settings.development", package: "com.android.settings.development",
container: "system", container: "system_ext",
srcs: [ srcs: [
"development/**/*.aconfig", "development/**/*.aconfig",
], ],

2
aconfig/accessibility/accessibility_flags.aconfig
View File

@@ -1,5 +1,5 @@
package: "com.android.settings.accessibility" package: "com.android.settings.accessibility"
container: "system" container: "system_ext"
# NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors. # NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors.

2
aconfig/development/settings_core_flag_declarations.aconfig
View File

@@ -1,5 +1,5 @@
package: "com.android.settings.development" package: "com.android.settings.development"
container: "system" container: "system_ext"
flag { flag {
name: "a2dp_offload_codec_extensibility_settings" name: "a2dp_offload_codec_extensibility_settings"

2
aconfig/factory_reset/factory_reset_flag_declarations.aconfig
View File

@@ -1,5 +1,5 @@
package: "com.android.settings.factory_reset" package: "com.android.settings.factory_reset"
container: "system" container: "system_ext"
flag { flag {
name: "enable_factory_reset_wizard" name: "enable_factory_reset_wizard"

4
aconfig/media_drm/settings_mediadrm_flag_declarations.aconfig
View File

@@ -1,9 +1,9 @@
package: "com.android.settings.media_drm" package: "com.android.settings.media_drm"
container: "system" container: "system_ext"
flag { flag {
name: "force_l3_enabled" name: "force_l3_enabled"
namespace: "media_drm" namespace: "media_drm"
description: "Feature flag of forcing L3" description: "Feature flag of forcing L3"
bug: "301669353" bug: "301669353"
} }