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

Commit 1e1e69ce authored by Ashwin Prakash's avatar Ashwin Prakash
Browse files

Merge branch 'a16' into 'v3.6-a16' 

avicii: 3.6 QA report fixes

See merge request !17
parents ad35515d 019d2dcd

audio/audio_io_policy.conf

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ outputs { 
    app_type 69943

  }

  voip_rx {

    flags AUDIO_OUTPUT_FLAG_VOIP_RX|AUDIO_OUTPUT_FLAG_DIRECT

    flags AUDIO_OUTPUT_FLAG_VOIP_RX

    formats AUDIO_FORMAT_PCM_16_BIT

    sampling_rates 8000|16000|32000|48000

    bit_width 16

audio/audio_policy_configuration.xml

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
                             samplingRates="8000,16000,48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="voip_rx" role="source"

                         flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_VOIP_RX">

                         flags="AUDIO_OUTPUT_FLAG_VOIP_RX">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

audio/audio_policy_configuration_a2dp_offload_disabled.xml

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
                             samplingRates="8000,16000,48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="voip_rx" role="source"

                         flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_VOIP_RX">

                         flags="AUDIO_OUTPUT_FLAG_VOIP_RX">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

device.mk

+3 −0
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ PRODUCT_COPY_FILES += \ 
    frameworks/native/data/etc/android.hardware.audio.pro.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.pro.xml \

    frameworks/native/data/etc/android.software.midi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.midi.xml



$(call soong_config_set,android_hardware_audio,skip_speaker_layout_channel_mask_field,true)



# Authsecret

PRODUCT_PACKAGES += \

    android.hardware.authsecret@1.0.vendor
@@ -303,6 +305,7 @@ DEVICE_PACKAGE_OVERLAYS += \ 
PRODUCT_ENFORCE_RRO_TARGETS := *

PRODUCT_PACKAGES += \

    CarrierConfigResCommon \

    eCameraTarget \

    FrameworksResTarget \

    NcmTetheringOverlay \

    OPlusFrameworksResCommon \

overlay-lineage/packages/apps/Aperture/app/src/main/res/values/config.xml

+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ 


    <!-- List of ID of auxiliary cameras that must be ignored by the app. -->

    <string-array name="config_ignoredAuxCameraIds">

        <item>3</item>

        <item>4</item>

        <item>6</item>

        <item>7</item>

    </string-array>



    <!-- List of ID of camera devices that doesn't advertise