commit 14ccae4b88ab6ea9f4a7ebe2876bb10a323c3fae
author Atneya Nair <atneya@google.com> Tue Nov 19 17:58:37 2024 -0800
committer Atneya Nair <atneya@google.com> Thu Nov 21 23:30:07 2024 +0000
tree 70ae77d4046e016f4cdef5214597a97fac5a1430
parent 0256b32f63e86cbf12bb629cd1d58bd2b98d613e

[audio] Add mute event type to SystemApi

Test: Compiles
Flag: EXEMPT safe
Bug: 380329395
Change-Id: I9b06cde5e841b3f16a4a6d85f2e1e31cae6435f5

core/api/system-current.txt

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 14a6c8c..c9d629c 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -7674,6 +7674,7 @@
     field @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int MUTED_BY_APP_OPS = 8; // 0x8
     field @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int MUTED_BY_CLIENT_VOLUME = 16; // 0x10
     field @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int MUTED_BY_MASTER = 1; // 0x1
+    field @FlaggedApi("android.media.audio.muted_by_port_volume_api") @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int MUTED_BY_OP_CONTROL_AUDIO = 128; // 0x80
     field @FlaggedApi("android.media.audio.muted_by_port_volume_api") @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int MUTED_BY_PORT_VOLUME = 64; // 0x40
     field @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int MUTED_BY_STREAM_MUTED = 4; // 0x4
     field @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static final int MUTED_BY_STREAM_VOLUME = 2; // 0x2

media/java/android/media/AudioPlaybackConfiguration.java

diff --git a/media/java/android/media/AudioPlaybackConfiguration.java b/media/java/android/media/AudioPlaybackConfiguration.java
index 62fb012..66da031 100644
--- a/media/java/android/media/AudioPlaybackConfiguration.java
+++ b/media/java/android/media/AudioPlaybackConfiguration.java
@@ -315,6 +315,9 @@
      * @hide
      * Flag used when playback is muted by AppOpsManager#OP_CONTROL_AUDIO.
      */
+    @SystemApi
+    @FlaggedApi(FLAG_MUTED_BY_PORT_VOLUME_API)
+    @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING)
     public static final int MUTED_BY_OP_CONTROL_AUDIO = (1 << 7);
 
     /** @hide */