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

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

Snap for 7028657 from 0dc2d4a6 to sc-release 

Change-Id: I97b8e3a3067e91b47e9f666dbf65804b2d891f31
parents e710bf46 0dc2d4a6

audio/7.0/config/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -259,6 +259,7 @@ package android.audio.policy.configuration.V7_0 { 
    enum_constant public static final android.audio.policy.configuration.V7_0.AudioInOutFlag AUDIO_OUTPUT_FLAG_DIRECT;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioInOutFlag AUDIO_OUTPUT_FLAG_DIRECT_PCM;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioInOutFlag AUDIO_OUTPUT_FLAG_FAST;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioInOutFlag AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioInOutFlag AUDIO_OUTPUT_FLAG_HW_AV_SYNC;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioInOutFlag AUDIO_OUTPUT_FLAG_IEC958_NONAUDIO;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioInOutFlag AUDIO_OUTPUT_FLAG_INCALL_MUSIC;

audio/7.0/config/audio_policy_configuration.xsd

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ 
            <xs:enumeration value="AUDIO_OUTPUT_FLAG_MMAP_NOIRQ" />

            <xs:enumeration value="AUDIO_OUTPUT_FLAG_VOIP_RX" />

            <xs:enumeration value="AUDIO_OUTPUT_FLAG_INCALL_MUSIC" />

            <xs:enumeration value="AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD" />

            <xs:enumeration value="AUDIO_INPUT_FLAG_NONE" />

            <xs:enumeration value="AUDIO_INPUT_FLAG_FAST" />

            <xs:enumeration value="AUDIO_INPUT_FLAG_HW_HOTWORD" />

automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp

+15 −4
Original line number Diff line number Diff line
@@ -305,11 +305,22 @@ TEST_P(EvsHidlTest, CameraOpenClean) { 
            const auto id = 0xFFFFFFFF; // meaningless id

            hidl_vec<uint8_t> values;

            auto err = pCam->setExtendedInfo_1_1(id, values);

            if (isLogicalCam) {

                // Logical camera device does not support setExtendedInfo

                // method.

                ASSERT_EQ(EvsResult::INVALID_ARG, err);

            } else {

                ASSERT_NE(EvsResult::INVALID_ARG, err);

            }





            pCam->getExtendedInfo_1_1(id, [](const auto& result, const auto& data) {

            pCam->getExtendedInfo_1_1(id, [&isLogicalCam](const auto& result, const auto& data) {

                if (isLogicalCam) {

                    ASSERT_EQ(EvsResult::INVALID_ARG, result);

                } else {

                    ASSERT_NE(EvsResult::INVALID_ARG, result);

                    ASSERT_EQ(0, data.size());

                }

            });



            // Explicitly close the camera so resources are released right away