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

Commit e07b0ec8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "AIDL: Fix test after aosp/2704653" into main am: 07ece85d am:... 

Merge "AIDL: Fix test after aosp/2704653" into main am: 07ece85d am: 192b7b91 am: eb69ccde am: 6f168d17 am: 2c4da0b3

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2719575



Change-Id: I1938e001790a01cfe104553d04fd28e1bb4d6bdb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4132fd87 2c4da0b3

media/audioaidlconversion/TEST_MAPPING

+6 −2
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "audio_aidl_conversion_tests",

      "name": "audio_aidl_ndk_conversion_tests",

      "name": "audio_aidl_conversion_tests"

    },

    {

      "name": "audio_aidl_ndk_conversion_tests"

    },

    {

      "name": "audio_aidl_ndk_cpp_conversion_tests"

    }

  ]

media/libaudioclient/tests/audio_aidl_legacy_conversion_tests.cpp

+2 −1
Original line number Diff line number Diff line
@@ -143,7 +143,8 @@ AudioDeviceDescription make_ADD_MicIn() { 
}



AudioDeviceDescription make_ADD_RSubmixIn() {

    return make_AudioDeviceDescription(AudioDeviceType::IN_SUBMIX);

    return make_AudioDeviceDescription(AudioDeviceType::IN_SUBMIX,

                                       AudioDeviceDescription::CONNECTION_VIRTUAL());

}



AudioDeviceDescription make_ADD_DefaultOut() {