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

Commit 3b0b4a38 authored by Shunkai Yao's avatar Shunkai Yao Committed by Automerger Merge Worker
Browse files

Merge "HalVersionManager: make instance_ptr after static versions init" into... 

Merge "HalVersionManager: make instance_ptr after static versions init" into main am: 072a2714 am: 31409b64

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2982466



Change-Id: I372500c23866e47ffedf73743773398cbd62eafb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2c85bc36 31409b64

system/audio_hal_interface/hal_version_manager.cc

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

static const std::string kDefaultAudioProviderFactoryInterface =

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

    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) {

std::string toString(BluetoothAudioHalTransport transport) {

  switch (transport) {

  switch (transport) {

    case BluetoothAudioHalTransport::UNKNOWN:

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

const BluetoothAudioHalVersion BluetoothAudioHalVersion::VERSION_AIDL_V4 =

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

    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.

 * A singleton implementation to get the AIDL interface version.

 */

 */