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

Commit 63abd8fd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I41328afc,Ie543519f into pi-dev 

* changes:
  Audio: setParam improve status_t to Result consistency
  Audio: make core/4.0/default/Util.h version dependant
parents fb749217 fba21730

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/all-versions/default/Util.h"

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



#define AUDIO_HAL_VERSION V2_0

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

audio/core/2.0/default/ParametersUtil.cpp

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



#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/all-versions/default/Util.h"

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



#define AUDIO_HAL_VERSION V2_0

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

audio/core/2.0/default/Stream.cpp

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#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/all-versions/default/Util.h"

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



#define AUDIO_HAL_VERSION V2_0

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