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

Commit 42f3ec65 authored by ESWAR MAGATAPALLI (xWF)'s avatar ESWAR MAGATAPALLI (xWF) Committed by Automerger Merge Worker
Browse files

Merge "Revert "Replace channel layout for 13.0"" into main am: 7a80a544 am: 94f10f48 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3418159



Change-Id: Ice311fcbdf9c13459ee2b3b22a705277e30863af
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8d8c85e3 94f10f48

audio/aidl/common/tests/utils_tests.cpp

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ TEST(UtilsTest, ChannelCountForLayoutMask) { 
            std::make_pair(6UL, AudioChannelLayout::LAYOUT_5POINT1),

            std::make_pair(8UL, AudioChannelLayout::LAYOUT_7POINT1),

            std::make_pair(16UL, AudioChannelLayout::LAYOUT_9POINT1POINT6),

            std::make_pair(13UL, AudioChannelLayout::LAYOUT_13POINT0),

            std::make_pair(13UL, AudioChannelLayout::LAYOUT_13POINT_360RA),

            std::make_pair(24UL, AudioChannelLayout::LAYOUT_22POINT2),

            std::make_pair(3UL, AudioChannelLayout::LAYOUT_STEREO_HAPTIC_A),

            std::make_pair(4UL, AudioChannelLayout::LAYOUT_STEREO_HAPTIC_AB)};

audio/aidl/default/config/audioPolicy/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ package android.audio.policy.configuration { 
    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_VOICE_DNLINK_MONO;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_VOICE_UPLINK_MONO;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_NONE;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_OUT_13POINT0;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_OUT_13POINT_360RA;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_OUT_22POINT2;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_OUT_2POINT0POINT2;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_OUT_2POINT1;

audio/aidl/default/config/audioPolicy/audio_policy_configuration.xsd

+1 −1
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ 
            <xs:enumeration value="AUDIO_CHANNEL_OUT_7POINT1POINT4"/>

            <xs:enumeration value="AUDIO_CHANNEL_OUT_9POINT1POINT4"/>

            <xs:enumeration value="AUDIO_CHANNEL_OUT_9POINT1POINT6"/>

            <xs:enumeration value="AUDIO_CHANNEL_OUT_13POINT0"/>

            <xs:enumeration value="AUDIO_CHANNEL_OUT_13POINT_360RA"/>

            <xs:enumeration value="AUDIO_CHANNEL_OUT_22POINT2"/>

            <xs:enumeration value="AUDIO_CHANNEL_OUT_MONO_HAPTIC_A"/>

            <xs:enumeration value="AUDIO_CHANNEL_OUT_STEREO_HAPTIC_A"/>

audio/aidl/vts/VtsHalDownmixTargetTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static const std::vector<int32_t> kLayoutValues = { 
        AudioChannelLayout::LAYOUT_5POINT1POINT4, AudioChannelLayout::LAYOUT_6POINT1,

        AudioChannelLayout::LAYOUT_7POINT1,       AudioChannelLayout::LAYOUT_7POINT1POINT2,

        AudioChannelLayout::LAYOUT_7POINT1POINT4, AudioChannelLayout::LAYOUT_9POINT1POINT4,

        AudioChannelLayout::LAYOUT_9POINT1POINT6, AudioChannelLayout::LAYOUT_13POINT0,

        AudioChannelLayout::LAYOUT_9POINT1POINT6, AudioChannelLayout::LAYOUT_13POINT_360RA,

        AudioChannelLayout::LAYOUT_22POINT2};



static const std::vector<int32_t> kChannels = {