commit 781fbcbdcad1fbd1a4c50dd217c805fed463e5f9
author Jean-Michel Trivi <jmtrivi@google.com> Mon Oct 30 21:11:09 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 30 21:11:09 2023 +0000
tree adb6d39d1231eff584517d16938ba2c9621c78ad
parent 4a3ec61624774263175d96e52efc2d541c5d73e7
parent 2f5cc0db854fc683e79f2550001985613ce38c74

Merge "Audio flags: add flag for audio focus test APIs" into main

media/audio/aconfig/audio_flags.aconfig

diff --git a/media/audio/aconfig/audio_flags.aconfig b/media/audio/aconfig/audio_flags.aconfig
index 1fd376b..85638c4 100644
--- a/media/audio/aconfig/audio_flags.aconfig
+++ b/media/audio/aconfig/audio_flags.aconfig
@@ -14,11 +14,10 @@
 }
 
 flag {
-    name: "configurable_prescale_absolute_volume"
+    name: "auto_public_volume_api_hardening"
     namespace: "media_audio"
-    description: "\
-Enable configurable pre-scale absolute volume."
-    bug: "302553525"
+    description: "On AAOS, make volume and ringer SDK APIs in AudioManager no-ops."
+    bug: "302751899"
 }
 
 flag {
@@ -31,6 +30,27 @@
 }
 
 flag {
+    name: "configurable_prescale_absolute_volume"
+    namespace: "media_audio"
+    description: "\
+Enable configurable pre-scale absolute volume."
+    bug: "302553525"
+}
+
+flag {
+    name: "focus_freeze_test_api"
+    namespace: "media_audio"
+    description: "\
+ AudioManager audio focus test APIs:\
+ AudioManager.enterAudioFocusFreezeForTest(java.util.List)\
+ AudioManager.exitAudioFocusFreezeForTest()\
+ AudioManager.getFocusDuckedUidsForTest()\
+ AudioManager.getFocusFadeOutDurationForTest()\
+ AudioManager.getFocusUnmuteDelayAfterFadeOutForTest()"
+    bug: "301713440"
+}
+
+flag {
     name: "mutex_priority_inheritance"
     namespace: "media_audio"
     description: "\
@@ -41,10 +61,3 @@
 blocking threads."
     bug: "209491695"
 }
-
-flag {
-    name: "auto_public_volume_api_hardening"
-    namespace: "media_audio"
-    description: "On AAOS, make volume and ringer SDK APIs in AudioManager no-ops."
-    bug: "302751899"
-}