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

Commit e0d03135 authored by Josh Wu's avatar Josh Wu
Browse files

HAL: Refactor files and namespaces 

* Move original implementation to hidl/ and add stubs
* Add HalVersionManager host implementation

Tag: #refactor
Bug: 203490261
Test: atest BluetoothInstrumentationTests
Change-Id: I73137a173704c4d5814bf91970c0e69125da5cf9
parent 19a6b14f

system/audio_hal_interface/Android.bp

+8 −3
Original line number Diff line number Diff line
@@ -36,11 +36,15 @@ cc_library_static { 
                "libfmq",

            ],

            srcs: [

                "hidl/a2dp_encoding_hidl.cc",

                "hidl/client_interface_hidl.cc",

                "hidl/codec_status_hidl.cc",

                "hidl/hearing_aid_software_encoding_hidl.cc",

                "hidl/le_audio_software_hidl.cc",

                "a2dp_encoding.cc",

                "client_interface.cc",

                "codec_status.cc",

                "hearing_aid_software_encoding.cc",

                "le_audio_software.cc",

                "hal_version_manager.cc",

            ],

        },

        host: {
@@ -48,6 +52,7 @@ cc_library_static { 
                "a2dp_encoding_host.cc",

                "hearing_aid_software_encoding_host.cc",

                "le_audio_software_host.cc",

                "hal_version_manager_host.cc",

            ],

        },

    },
@@ -67,7 +72,7 @@ cc_test { 
        "packages/modules/Bluetooth/system/stack/include",

    ],

    srcs: [

        "client_interface_unittest.cc",

        "hidl/client_interface_hidl_unittest.cc",

    ],

    shared_libs: [

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

system/audio_hal_interface/a2dp_encoding.cc

+57 −481

File changed.

Preview size limit exceeded, changes collapsed.

system/audio_hal_interface/a2dp_encoding.h

+2 −2
Original line number Diff line number Diff line
@@ -29,10 +29,10 @@ bool update_codec_offloading_capabilities( 
    const std::vector<btav_a2dp_codec_config_t>& framework_preference);



// Check if new bluetooth_audio is enabled

bool is_hal_2_0_enabled();

bool is_hal_enabled();



// Check if new bluetooth_audio is running with offloading encoders

bool is_hal_2_0_offloading();

bool is_hal_offloading();



// Initialize BluetoothAudio HAL: openProvider

bool init(bluetooth::common::MessageLoopThread* message_loop);

system/audio_hal_interface/a2dp_encoding_host.cc

+2 −2
Original line number Diff line number Diff line
@@ -203,10 +203,10 @@ bool update_codec_offloading_capabilities( 
}



// Checking if new bluetooth_audio is enabled

bool is_hal_2_0_enabled() { return true; }

bool is_hal_enabled() { return true; }



// Check if new bluetooth_audio is running with offloading encoders

bool is_hal_2_0_offloading() { return false; }

bool is_hal_offloading() { return false; }



// Initialize BluetoothAudio HAL: openProvider

bool init(bluetooth::common::MessageLoopThread* message_loop) {

system/audio_hal_interface/fuzzer/libbt_audio_hal_client_interface_fuzzer.cpp

+48 −45

File changed.

Preview size limit exceeded, changes collapsed.