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

Commit ad84668d authored by Nicholas Ambur's avatar Nicholas Ambur Committed by Android (Google) Code Review
Browse files

Merge "add SoundTrigger HAL V2.3"

parents 0bfc516c 1e900192

audio/common/all-versions/default/service/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ cc_binary { 
        "android.hardware.soundtrigger@2.0",

        "android.hardware.soundtrigger@2.1",

        "android.hardware.soundtrigger@2.2",

        "android.hardware.soundtrigger@2.3",

    ],

}

audio/common/all-versions/default/service/service.cpp

+4 −3
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <android/hardware/soundtrigger/2.0/ISoundTriggerHw.h>

#include <android/hardware/soundtrigger/2.1/ISoundTriggerHw.h>

#include <android/hardware/soundtrigger/2.2/ISoundTriggerHw.h>

#include <android/hardware/soundtrigger/2.3/ISoundTriggerHw.h>

#include <binder/ProcessState.h>

#include <cutils/properties.h>

#include <hidl/HidlTransportSupport.h>
@@ -78,9 +79,9 @@ int main(int /* argc */, char* /* argv */ []) { 
                        "Could not register audio effect API");

    // clang-format on



    ALOGW_IF((registerPassthroughServiceImplementations<soundtrigger::V2_2::ISoundTriggerHw,

                                                        soundtrigger::V2_1::ISoundTriggerHw,

                                                        soundtrigger::V2_0::ISoundTriggerHw>()),

    ALOGW_IF((registerPassthroughServiceImplementations<

                     soundtrigger::V2_3::ISoundTriggerHw, soundtrigger::V2_2::ISoundTriggerHw,

                     soundtrigger::V2_1::ISoundTriggerHw, soundtrigger::V2_0::ISoundTriggerHw>()),

             "Could not register soundtrigger API");



    ALOGW_IF(registerPassthroughServiceImplementations<

compatibility_matrices/compatibility_matrix.current.xml

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ 
    </hal>

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

        <name>android.hardware.soundtrigger</name>

        <version>2.0-2</version>

        <version>2.0-3</version>

        <interface>

            <name>ISoundTriggerHw</name>

            <instance>default</instance>

current.txt

+2 −0
Original line number Diff line number Diff line
@@ -664,3 +664,5 @@ c9273429fcf98d797d3bb07fdba6f1be95bf960f9255cde169fd1ca4db85f856 android.hardwar 
b27ab0cd40b0b078cdcd024bfe1061c4c4c065f3519eeb9347fa359a3268a5ae android.hardware.radio.config@1.3::IRadioConfig

742360c775313438b0f82256eac62fb5bbc76a6ae6f388573f3aa142fb2c1eea android.hardware.radio.config@1.3::IRadioConfigIndication

7683fed9d253956071f18b152e6be657719536f98d9b534433d5e411bcde5061 android.hardware.radio.config@1.3::IRadioConfigResponse

c411dc16855fcb786cd5e08fe2889acbd72fd54217bd27fe0373813de230ce5f android.hardware.soundtrigger@2.3::types

5abad7b54d3400fab633cb7a36ffc1747e037bf805d3d9e3517cb6aabf26b002 android.hardware.soundtrigger@2.3::ISoundTriggerHw

soundtrigger/2.3/Android.bp

0 → 100644
+22 −0
Original line number Diff line number Diff line 
// This file is autogenerated by hidl-gen -Landroidbp.



hidl_interface {

    name: "android.hardware.soundtrigger@2.3",

    root: "android.hardware",

    vndk: {

        enabled: true,

    },

    srcs: [

        "types.hal",

        "ISoundTriggerHw.hal",

    ],

    interfaces: [

        "android.hardware.audio.common@2.0",

        "android.hardware.soundtrigger@2.0",

        "android.hardware.soundtrigger@2.1",

        "android.hardware.soundtrigger@2.2",

        "android.hidl.base@1.0",

        "android.hidl.safe_union@1.0",

    ],

    gen_java: true,

}