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

Commit afd899c6 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android (Google) Code Review
Browse files

Merge "Respect Android conventions in AudioManager extras" into lmp-dev

parents 2caa0a60 deddda5d

api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -14236,9 +14236,9 @@ package android.media { 
    field public static final int AUDIO_SESSION_ID_GENERATE = 0; // 0x0

    field public static final int ERROR = -1; // 0xffffffff

    field public static final int ERROR_DEAD_OBJECT = -6; // 0xfffffffa

    field public static final java.lang.String EXTRA_AUDIO_PLUG_STATE = "android.media.extra.audio_plug_state";

    field public static final java.lang.String EXTRA_ENCODINGS = "android.media.extra.encodings";

    field public static final java.lang.String EXTRA_MAX_CHANNEL_COUNT = "android.media.extra.max_channel_count";

    field public static final java.lang.String EXTRA_AUDIO_PLUG_STATE = "android.media.extra.AUDIO_PLUG_STATE";

    field public static final java.lang.String EXTRA_ENCODINGS = "android.media.extra.ENCODINGS";

    field public static final java.lang.String EXTRA_MAX_CHANNEL_COUNT = "android.media.extra.MAX_CHANNEL_COUNT";

    field public static final java.lang.String EXTRA_RINGER_MODE = "android.media.EXTRA_RINGER_MODE";

    field public static final java.lang.String EXTRA_SCO_AUDIO_PREVIOUS_STATE = "android.media.extra.SCO_AUDIO_PREVIOUS_STATE";

    field public static final java.lang.String EXTRA_SCO_AUDIO_STATE = "android.media.extra.SCO_AUDIO_STATE";

media/java/android/media/AudioManager.java

+3 −3
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ public class AudioManager { 
     * or unplugged.

     * An integer value of 1 indicates a plugged-in state, 0 is unplugged.

     */

    public static final String EXTRA_AUDIO_PLUG_STATE = "android.media.extra.audio_plug_state";

    public static final String EXTRA_AUDIO_PLUG_STATE = "android.media.extra.AUDIO_PLUG_STATE";



    /**

     * Extra used in {@link #ACTION_HDMI_AUDIO_PLUG} to define the maximum number of channels
@@ -251,7 +251,7 @@ public class AudioManager { 
     * The corresponding integer value is only available when the device is plugged in (as expressed

     * by {@link #EXTRA_AUDIO_PLUG_STATE}).

     */

    public static final String EXTRA_MAX_CHANNEL_COUNT = "android.media.extra.max_channel_count";

    public static final String EXTRA_MAX_CHANNEL_COUNT = "android.media.extra.MAX_CHANNEL_COUNT";



    /**

     * Extra used in {@link #ACTION_HDMI_AUDIO_PLUG} to define the audio encodings supported by
@@ -261,7 +261,7 @@ public class AudioManager { 
     * {@link AudioFormat} (for instance see {@link AudioFormat#ENCODING_PCM_16BIT}). Use

     * {@link android.content.Intent#getIntArrayExtra(String)} to retrieve the encoding values.

     */

    public static final String EXTRA_ENCODINGS = "android.media.extra.encodings";

    public static final String EXTRA_ENCODINGS = "android.media.extra.ENCODINGS";



    /**

     * Broadcast Action: An analog audio speaker/headset plugged in or unplugged.