Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17698f32 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[audio] Add mute event type to SystemApi" into main

parents 00821838 14ccae4b

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -7637,6 +7637,7 @@ package android.media { 
    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

+3 −0
Original line number Diff line number Diff line
@@ -315,6 +315,9 @@ public final class AudioPlaybackConfiguration implements Parcelable { 
     * @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 */