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

Commit 46212613 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7054508 from 164ee63c to sc-release 

Change-Id: Id6c6a121ce1d283002d07a2a3ac77be00017b1f3
parents 5ac0d403 164ee63c

audio/audio_policy_configuration.xml

+0 −3
Original line number Diff line number Diff line
@@ -206,9 +206,6 @@ 
            </routes>

        </module>



        <!-- A2DP Input Audio HAL -->

        <xi:include href="a2dp_in_audio_policy_configuration.xml"/>



        <!-- Usb Audio HAL -->

        <module name="usb" halVersion="2.0">

            <mixPorts>

usb/Usb.cpp

+7 −1
Original line number Diff line number Diff line
@@ -97,6 +97,11 @@ int32_t writeFile(const std::string &filename, const std::string &contents) { 
Status queryMoistureDetectionStatus(hidl_vec<PortStatus> *currentPortStatus_1_2) {

    std::string enabled, status;



    if (currentPortStatus_1_2 == NULL || currentPortStatus_1_2->size() == 0) {

        ALOGE("currentPortStatus_1_2 is not available");

        return Status::ERROR;

    }



    (*currentPortStatus_1_2)[0].supportedContaminantProtectionModes = 0;

    (*currentPortStatus_1_2)[0].supportedContaminantProtectionModes |=

        ContaminantProtectionMode::FORCE_SINK;
@@ -563,6 +568,7 @@ void queryVersionHelper(android::hardware::usb::V1_2::implementation::Usb *usb, 
    if (usb->mCallback_1_0 != NULL) {

        if (callback_V1_2 != NULL) {

            status = getPortStatusHelper(currentPortStatus_1_2, HALVersion::V1_2);

            if (status == Status::SUCCESS)

                queryMoistureDetectionStatus(currentPortStatus_1_2);

        } else if (callback_V1_1 != NULL) {

            status = getPortStatusHelper(currentPortStatus_1_2, HALVersion::V1_1);

vf/device_framework_matrix_product.xml

+8 −0
Original line number Diff line number Diff line
@@ -15,4 +15,12 @@ 
            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>vendor.qti.hardware.bluetooth_sar</name>

        <version>1.1</version>

        <interface>

            <name>IBluetoothSar</name>

            <instance>default</instance>

        </interface>

    </hal>

</compatibility-matrix>