commit a8f139322e67234e9260e39176a8ab0f732134a8
author Kevin Rocard <krocard@google.com> Tue Jun 25 16:08:29 2019 -0700
committer Mikhail Naganov <mnaganov@google.com> Thu Nov 07 14:32:51 2019 -0800
tree d55a2c5865450ddae99272273099c6f18723a9f3
parent e4ff5510d91b613ea59055d0d95035cef1993a5d

Avoid querying the audio service twice

Bug: 134940862
Test: run on target
Change-Id: Ia884d0e926569d983ba12952817d2cecc8d8d34f
Merged-In: Ia884d0e926569d983ba12952817d2cecc8d8d34f
Signed-off-by: Kevin Rocard <krocard@google.com>

media/libaudiohal/DevicesFactoryHalInterface.cpp

diff --git a/media/libaudiohal/DevicesFactoryHalInterface.cpp b/media/libaudiohal/DevicesFactoryHalInterface.cpp
index f86009c..5068d23 100644
--- a/media/libaudiohal/DevicesFactoryHalInterface.cpp
+++ b/media/libaudiohal/DevicesFactoryHalInterface.cpp
@@ -14,26 +14,18 @@
  * limitations under the License.
  */
 
-#include <android/hardware/audio/2.0/IDevicesFactory.h>
-#include <android/hardware/audio/4.0/IDevicesFactory.h>
-#include <android/hardware/audio/5.0/IDevicesFactory.h>
-
 #include <libaudiohal/FactoryHalHidl.h>
 
+#include <media/audiohal/DevicesFactoryHalInterface.h>
+
 namespace android {
 
 // static
 sp<DevicesFactoryHalInterface> DevicesFactoryHalInterface::create() {
-    if (hardware::audio::V5_0::IDevicesFactory::getService() != nullptr) {
-        return V5_0::createDevicesFactoryHal();
-    }
-    if (hardware::audio::V4_0::IDevicesFactory::getService() != nullptr) {
-        return V4_0::createDevicesFactoryHal();
-    }
-    if (hardware::audio::V2_0::IDevicesFactory::getService() != nullptr) {
-        return V2_0::createDevicesFactoryHal();
-    }
-    return nullptr;
+    return V5_0::createDevicesFactoryHal() ?:
+           V4_0::createDevicesFactoryHal() ?:
+           V2_0::createDevicesFactoryHal() ?:
+           nullptr;
 }
 
 } // namespace android