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

system/audio_hal_interface/hal_version_manager.cc

@@ -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.
  */