commit df9b420d1a43d4fa7d75e10f00a15e482c994cae
author Kevin Rocard <krocard@google.com> Thu May 10 19:56:08 2018 -0700
committer Kevin Rocard <krocard@google.com> Mon Jun 18 12:58:10 2018 -0700
tree c7367730f593d5904396f5ef2bb04010d97090ca
parent d308499867c5403eb68113c793727183f82a48cf

Align LibAudioHal V2 and V4 for factorisation

In order to merge the two version, they must first align as much
as possible.

Test: playback music, assistant
Change-Id: If517cc3f4646a224af3e9b3d42b68a75f1801b39
Signed-off-by: Kevin Rocard <krocard@google.com>

media/libaudiohal/4.0/ConversionHelperHidl.h

diff --git a/media/libaudiohal/4.0/ConversionHelperHidl.h b/media/libaudiohal/4.0/ConversionHelperHidl.h
index 8823a8d..1dc113c 100644
--- a/media/libaudiohal/4.0/ConversionHelperHidl.h
+++ b/media/libaudiohal/4.0/ConversionHelperHidl.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_HARDWARE_CONVERSION_HELPER_HIDL_4_0_H
-#define ANDROID_HARDWARE_CONVERSION_HELPER_HIDL_4_0_H
+#ifndef ANDROID_HARDWARE_CONVERSION_HELPER_HIDL_H
+#define ANDROID_HARDWARE_CONVERSION_HELPER_HIDL_H
 
 #include <android/hardware/audio/4.0/types.h>
 #include <hidl/HidlSupport.h>
@@ -23,6 +23,7 @@
 #include <utils/String8.h>
 
 using ::android::hardware::audio::V4_0::ParameterValue;
+using CoreResult = ::android::hardware::audio::V4_0::Result;
 using ::android::hardware::audio::V4_0::MicrophoneInfo;
 using ::android::hardware::Return;
 using ::android::hardware::hidl_string;
@@ -59,7 +60,7 @@
         return ret.isOk() ? OK : FAILED_TRANSACTION;
     }
 
-    status_t processReturn(const char* funcName, const Return<hardware::audio::V4_0::Result>& ret) {
+    status_t processReturn(const char* funcName, const Return<CoreResult>& ret) {
         if (!ret.isOk()) {
             emitError(funcName, ret.description().c_str());
         }
@@ -68,7 +69,7 @@
 
     template<typename T>
     status_t processReturn(
-            const char* funcName, const Return<T>& ret, hardware::audio::V4_0::Result retval) {
+            const char* funcName, const Return<T>& ret, CoreResult retval) {
         if (!ret.isOk()) {
             emitError(funcName, ret.description().c_str());
         }
@@ -78,7 +79,7 @@
   private:
     const char* mClassName;
 
-    static status_t analyzeResult(const hardware::audio::V4_0::Result& result);
+    static status_t analyzeResult(const CoreResult& result);
 
     void emitError(const char* funcName, const char* description);
 };
@@ -86,4 +87,4 @@
 }  // namespace V4_0
 }  // namespace android
 
-#endif // ANDROID_HARDWARE_CONVERSION_HELPER_HIDL_4_0_H
+#endif // ANDROID_HARDWARE_CONVERSION_HELPER_HIDL_H