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

Commit fd812861 authored by Kevin Rocard's avatar Kevin Rocard Committed by android-build-merger
Browse files

Merge "Revert "Audio: setParam improve status_t to Result consistency"" into pi-dev 

am: 3c50fab0

Change-Id: I2a51aeaac422a7f01615d9a7a11cdee480a35543
parents 614ce638 3c50fab0

audio/core/2.0/default/Device.cpp

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include "core/2.0/default/Conversions.h"

#include "core/2.0/default/StreamIn.h"

#include "core/2.0/default/StreamOut.h"

#include "core/2.0/default/Util.h"

#include "core/all-versions/default/Util.h"



#define AUDIO_HAL_VERSION V2_0

#include <core/all-versions/default/Device.impl.h>

audio/core/2.0/default/ParametersUtil.cpp

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */



#include "core/2.0/default/ParametersUtil.h"

#include "core/2.0/default/Util.h"



#define AUDIO_HAL_VERSION V2_0

#include <core/all-versions/default/ParametersUtil.impl.h>

audio/core/2.0/default/PrimaryDevice.cpp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#define LOG_TAG "PrimaryDeviceHAL"



#include "core/2.0/default/PrimaryDevice.h"

#include "core/2.0/default/Util.h"

#include "core/all-versions/default/Util.h"



#define AUDIO_HAL_VERSION V2_0

#include <core/all-versions/default/PrimaryDevice.impl.h>

audio/core/2.0/default/Stream.cpp

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include "core/2.0/default/Stream.h"

#include "common/all-versions/default/EffectMap.h"

#include "core/2.0/default/Conversions.h"

#include "core/2.0/default/Util.h"



#define AUDIO_HAL_VERSION V2_0

#include <core/all-versions/default/Stream.impl.h>

audio/core/2.0/default/StreamIn.cpp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#define LOG_TAG "StreamInHAL"



#include "core/2.0/default/StreamIn.h"

#include "core/2.0/default/Util.h"

#include "core/all-versions/default/Util.h"



#define AUDIO_HAL_VERSION V2_0

#include <core/all-versions/default/StreamIn.impl.h>