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

Commit a62a52de authored by Shunkai Yao's avatar Shunkai Yao
Browse files

HalVersionManager: make instance_ptr after static versions init 

BluetoothAudioHalVersion::VERSION* needs to be initialized before
instance_ptr.

Bug: 326888178
Test: m
Test: Build and test A2DP on Pixel 5a
Test: atest BluetoothAudioHalVersionTest
Change-Id: I0832b91dc13644b30ad32a0ad071cc531916838a
parent 92a4c663

system/audio_hal_interface/hal_version_manager.cc

+4 −4
Original line number Diff line number Diff line
@@ -36,10 +36,6 @@ using ::aidl::android::hardware::bluetooth::audio:: 
static const std::string kDefaultAudioProviderFactoryInterface =

    std::string() + IBluetoothAudioProviderFactory::descriptor + "/default";



// Ideally HalVersionManager can be a singleton class

std::unique_ptr<HalVersionManager> HalVersionManager::instance_ptr =

    std::make_unique<HalVersionManager>();



std::string toString(BluetoothAudioHalTransport transport) {

  switch (transport) {

    case BluetoothAudioHalTransport::UNKNOWN:
@@ -68,6 +64,10 @@ const BluetoothAudioHalVersion BluetoothAudioHalVersion::VERSION_AIDL_V3 = 
const BluetoothAudioHalVersion BluetoothAudioHalVersion::VERSION_AIDL_V4 =

    BluetoothAudioHalVersion(BluetoothAudioHalTransport::AIDL, 4, 0);



// Ideally HalVersionManager can be a singleton class

std::unique_ptr<HalVersionManager> HalVersionManager::instance_ptr =

    std::make_unique<HalVersionManager>();



/**

 * A singleton implementation to get the AIDL interface version.

 */