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/impl/EffectsFactoryHalHidl.h

diff --git a/media/libaudiohal/impl/EffectsFactoryHalHidl.h b/media/libaudiohal/impl/EffectsFactoryHalHidl.h
index 01178ff..bed4f7e 100644
--- a/media/libaudiohal/impl/EffectsFactoryHalHidl.h
+++ b/media/libaudiohal/impl/EffectsFactoryHalHidl.h
@@ -18,7 +18,6 @@
 #define ANDROID_HARDWARE_EFFECTS_FACTORY_HAL_HIDL_H
 
 #include PATH(android/hardware/audio/effect/FILE_VERSION/IEffectsFactory.h)
-#include PATH(android/hardware/audio/effect/FILE_VERSION/types.h)
 #include <media/audiohal/EffectsFactoryHalInterface.h>
 
 #include "ConversionHelperHidl.h"
@@ -34,7 +33,7 @@
 class EffectsFactoryHalHidl : public EffectsFactoryHalInterface, public ConversionHelperHidl
 {
   public:
-    EffectsFactoryHalHidl();
+    EffectsFactoryHalHidl(sp<IEffectsFactory> effectsFactory);
 
     // Returns the number of different effects in all loaded libraries.
     virtual status_t queryNumberEffects(uint32_t *pNumEffects);
@@ -67,7 +66,8 @@
 };
 
 sp<EffectsFactoryHalInterface> createEffectsFactoryHal() {
-    return new EffectsFactoryHalHidl();
+    auto service = IEffectsFactory::getService();
+    return service ? new EffectsFactoryHalHidl(service) : nullptr;
 }
 
 } // namespace CPP_VERSION