summaryrefslogtreecommitdiff
path: root/media
diff options
context:
space:
mode:
authorOriol Prieto Gasco <opg@google.com>2024-04-30 20:05:05 +0000
committerOriol Prieto Gascó <opg@google.com>2024-05-03 11:42:54 +0000
commit7b816129bafb07d7a1524f2cb375fb4c6af68eb0 (patch)
tree48fce6c811e201bea54ff6532eb52c3157691d6f /media
parentca3da5d19c2bf7529b289b3e1da3ed45a7db657e (diff)
downloadbase-7b816129bafb07d7a1524f2cb375fb4c6af68eb0.tar.gz
RESTRICT AUTOMERGE
Set the container field of aconfig flags Test: printflags --format='{package}:{container}:' | grep "::" Bug: 312769710 Flag: NONE Change-Id: I84fda0d5e9813940609436d825738ff786908ff0
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/flags/fade_manager_configuration.aconfig1
-rw-r--r--media/java/android/media/flags/media_better_together.aconfig1
-rw-r--r--media/java/android/media/tv/flags/media_tv.aconfig1
-rw-r--r--media/jni/playback_flags.aconfig1
4 files changed, 4 insertions, 0 deletions
diff --git a/media/java/android/media/flags/fade_manager_configuration.aconfig b/media/java/android/media/flags/fade_manager_configuration.aconfig
index 100e2235a7a8..1f663dcaac45 100644
--- a/media/java/android/media/flags/fade_manager_configuration.aconfig
+++ b/media/java/android/media/flags/fade_manager_configuration.aconfig
@@ -1,4 +1,5 @@
package: "com.android.media.flags"
+container: "system"
flag {
namespace: "media_solutions"
diff --git a/media/java/android/media/flags/media_better_together.aconfig b/media/java/android/media/flags/media_better_together.aconfig
index 07f63e5441af..5276d22ecc78 100644
--- a/media/java/android/media/flags/media_better_together.aconfig
+++ b/media/java/android/media/flags/media_better_together.aconfig
@@ -1,4 +1,5 @@
package: "com.android.media.flags"
+container: "system"
flag {
name: "enable_rlp_callbacks_in_media_router2"
diff --git a/media/java/android/media/tv/flags/media_tv.aconfig b/media/java/android/media/tv/flags/media_tv.aconfig
index 018eaf6dc32f..baffb001e49b 100644
--- a/media/java/android/media/tv/flags/media_tv.aconfig
+++ b/media/java/android/media/tv/flags/media_tv.aconfig
@@ -1,4 +1,5 @@
package: "android.media.tv.flags"
+container: "system"
flag {
name: "broadcast_visibility_types"
diff --git a/media/jni/playback_flags.aconfig b/media/jni/playback_flags.aconfig
index 2bb0ec5375fd..9d927eccc596 100644
--- a/media/jni/playback_flags.aconfig
+++ b/media/jni/playback_flags.aconfig
@@ -1,4 +1,5 @@
package: "com.android.media.playback.flags"
+container: "system"
flag {
name: "mediametadataretriever_default_rgba8888"