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

Commit b4d533ba authored by Arunesh Mishra's avatar Arunesh Mishra Committed by Android (Google) Code Review
Browse files

Merge "Add AudioManager property strings for ultrasound."

parents eca706ed d08715e5

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -14888,6 +14888,8 @@ package android.media { 
    field public static final deprecated int NUM_STREAMS = 5; // 0x5

    field public static final java.lang.String PROPERTY_OUTPUT_FRAMES_PER_BUFFER = "android.media.property.OUTPUT_FRAMES_PER_BUFFER";

    field public static final java.lang.String PROPERTY_OUTPUT_SAMPLE_RATE = "android.media.property.OUTPUT_SAMPLE_RATE";

    field public static final java.lang.String PROPERTY_SUPPORT_MIC_NEAR_ULTRASOUND = "android.media.property.SUPPORT_MIC_NEAR_ULTRASOUND";

    field public static final java.lang.String PROPERTY_SUPPORT_SPEAKER_NEAR_ULTRASOUND = "android.media.property.SUPPORT_SPEAKER_NEAR_ULTRASOUND";

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

    field public static final int RINGER_MODE_NORMAL = 2; // 0x2

    field public static final int RINGER_MODE_SILENT = 0; // 0x0

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -16098,6 +16098,8 @@ package android.media { 
    field public static final deprecated int NUM_STREAMS = 5; // 0x5

    field public static final java.lang.String PROPERTY_OUTPUT_FRAMES_PER_BUFFER = "android.media.property.OUTPUT_FRAMES_PER_BUFFER";

    field public static final java.lang.String PROPERTY_OUTPUT_SAMPLE_RATE = "android.media.property.OUTPUT_SAMPLE_RATE";

    field public static final java.lang.String PROPERTY_SUPPORT_MIC_NEAR_ULTRASOUND = "android.media.property.SUPPORT_MIC_NEAR_ULTRASOUND";

    field public static final java.lang.String PROPERTY_SUPPORT_SPEAKER_NEAR_ULTRASOUND = "android.media.property.SUPPORT_SPEAKER_NEAR_ULTRASOUND";

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

    field public static final int RINGER_MODE_NORMAL = 2; // 0x2

    field public static final int RINGER_MODE_SILENT = 0; // 0x0

media/java/android/media/AudioManager.java

+14 −0
Original line number Diff line number Diff line
@@ -3146,6 +3146,20 @@ public class AudioManager { 
    public static final String PROPERTY_OUTPUT_FRAMES_PER_BUFFER =

            "android.media.property.OUTPUT_FRAMES_PER_BUFFER";



    /**

     * Used as a key for {@link #getProperty} to determine if the default microphone audio source

     * supports near-ultrasound frequencies (range of 18 - 21 kHz).

     */

    public static final String PROPERTY_SUPPORT_MIC_NEAR_ULTRASOUND =

            "android.media.property.SUPPORT_MIC_NEAR_ULTRASOUND";



    /**

     * Used as a key for {@link #getProperty} to determine if the default speaker audio path

     * supports near-ultrasound frequencies (range of 18 - 21 kHz).

     */

    public static final String PROPERTY_SUPPORT_SPEAKER_NEAR_ULTRASOUND =

            "android.media.property.SUPPORT_SPEAKER_NEAR_ULTRASOUND";



    /**

     * Returns the value of the property with the specified key.

     * @param key One of the strings corresponding to a property key: either