diff options
| author | 2024-04-04 14:23:00 +0000 | |
|---|---|---|
| committer | 2024-04-04 14:23:00 +0000 | |
| commit | c22cba0720fde5abb5bfe1979c1ebcdbecb64c2e (patch) | |
| tree | b0d877a0774fdb317a43ff079c6595991aa0a71a | |
| parent | 8756fdba5f0dfe062c51450366ad50a6cbe048f0 (diff) | |
| parent | 38147a35914222685d1dd207fc1bcd676eb23f01 (diff) | |
Merge "set container for aconfig package" into main
| -rw-r--r-- | packages/SettingsLib/Android.bp | 2 | ||||
| -rw-r--r-- | packages/SettingsLib/aconfig/settingslib.aconfig | 1 | ||||
| -rw-r--r-- | packages/SettingsLib/aconfig/settingslib_media_flag_declarations.aconfig | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/packages/SettingsLib/Android.bp b/packages/SettingsLib/Android.bp index 0b36757868c7..d6cbf2a0f581 100644 --- a/packages/SettingsLib/Android.bp +++ b/packages/SettingsLib/Android.bp @@ -88,6 +88,7 @@ java_defaults { aconfig_declarations { name: "settingslib_media_flags", package: "com.android.settingslib.media.flags", + container: "system", srcs: [ "aconfig/settingslib_media_flag_declarations.aconfig", ], @@ -101,6 +102,7 @@ java_aconfig_library { aconfig_declarations { name: "settingslib_flags", package: "com.android.settingslib.flags", + container: "system", srcs: [ "aconfig/settingslib.aconfig", ], diff --git a/packages/SettingsLib/aconfig/settingslib.aconfig b/packages/SettingsLib/aconfig/settingslib.aconfig index 54c5a14702f6..e09ab0086451 100644 --- a/packages/SettingsLib/aconfig/settingslib.aconfig +++ b/packages/SettingsLib/aconfig/settingslib.aconfig @@ -1,4 +1,5 @@ package: "com.android.settingslib.flags" +container: "system" flag { name: "new_status_bar_icons" diff --git a/packages/SettingsLib/aconfig/settingslib_media_flag_declarations.aconfig b/packages/SettingsLib/aconfig/settingslib_media_flag_declarations.aconfig index f3e537b33230..4d70aec9fa5c 100644 --- a/packages/SettingsLib/aconfig/settingslib_media_flag_declarations.aconfig +++ b/packages/SettingsLib/aconfig/settingslib_media_flag_declarations.aconfig @@ -1,4 +1,5 @@ package: "com.android.settingslib.media.flags" +container: "system" flag { name: "use_media_router2_for_info_media_manager" |