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

Commit ed5865b1 authored by Ricardo Garcia's avatar Ricardo Garcia Committed by Android (Google) Code Review
Browse files

Merge "Adding UNPROCESSED to the available audio_sources and... 

Merge "Adding UNPROCESSED to the available audio_sources and SUPPORT_AUDIO_SOURCE_UNPROCESSED property"
parents 812c4633 a7cc59c3

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -19365,6 +19365,7 @@ 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_AUDIO_SOURCE_UNPROCESSED = "android.media.property.SUPPORT_AUDIO_SOURCE_UNPROCESSED";

    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";
@@ -20725,6 +20726,7 @@ package android.media { 
    field public static final int DEFAULT = 0; // 0x0

    field public static final int MIC = 1; // 0x1

    field public static final int REMOTE_SUBMIX = 8; // 0x8

    field public static final int UNPROCESSED = 9; // 0x9

    field public static final int VOICE_CALL = 4; // 0x4

    field public static final int VOICE_COMMUNICATION = 7; // 0x7

    field public static final int VOICE_DOWNLINK = 3; // 0x3

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -20670,6 +20670,7 @@ 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_AUDIO_SOURCE_UNPROCESSED = "android.media.property.SUPPORT_AUDIO_SOURCE_UNPROCESSED";

    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";
@@ -22035,6 +22036,7 @@ package android.media { 
    field public static final int MIC = 1; // 0x1

    field public static final int RADIO_TUNER = 1998; // 0x7ce

    field public static final int REMOTE_SUBMIX = 8; // 0x8

    field public static final int UNPROCESSED = 9; // 0x9

    field public static final int VOICE_CALL = 4; // 0x4

    field public static final int VOICE_COMMUNICATION = 7; // 0x7

    field public static final int VOICE_DOWNLINK = 3; // 0x3

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -19373,6 +19373,7 @@ 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_AUDIO_SOURCE_UNPROCESSED = "android.media.property.SUPPORT_AUDIO_SOURCE_UNPROCESSED";

    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";
@@ -20733,6 +20734,7 @@ package android.media { 
    field public static final int DEFAULT = 0; // 0x0

    field public static final int MIC = 1; // 0x1

    field public static final int REMOTE_SUBMIX = 8; // 0x8

    field public static final int UNPROCESSED = 9; // 0x9

    field public static final int VOICE_CALL = 4; // 0x4

    field public static final int VOICE_COMMUNICATION = 7; // 0x7

    field public static final int VOICE_DOWNLINK = 3; // 0x3

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -2362,6 +2362,9 @@ 
         (range of 18 - 21 kHz). -->

    <bool name="config_supportSpeakerNearUltrasound">true</bool>



    <!-- Whether the Unprocessed audio source supports the required frequency range and level -->

    <bool name="config_supportAudioSourceUnprocessed">false</bool>



    <!-- Flag indicating device support for EAP SIM, AKA, AKA' -->

    <bool name="config_eap_sim_based_auth_supported">true</bool>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -303,6 +303,7 @@ 
  <java-symbol type="bool" name="config_wifi_turn_off_during_emergency_call" />

  <java-symbol type="bool" name="config_supportMicNearUltrasound" />

  <java-symbol type="bool" name="config_supportSpeakerNearUltrasound" />

  <java-symbol type="bool" name="config_supportAudioSourceUnprocessed" />

  <java-symbol type="bool" name="config_freeformWindowManagement" />

  <java-symbol type="string" name="config_defaultPictureInPictureBounds" />

  <java-symbol type="string" name="config_centeredPictureInPictureBounds" />