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

Commit 87c2e38c authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Android (Google) Code Review
Browse files

Merge "Update NBAIO to use the new audio HAL abstraction layer"

parents 81614234 a0c91339

services/audioflinger/DevicesFactoryHalInterface.h→include/media/audiohal/DevicesFactoryHalInterface.h

+1 −2
Original line number Diff line number Diff line
@@ -17,11 +17,10 @@ 
#ifndef ANDROID_HARDWARE_DEVICES_FACTORY_HAL_INTERFACE_H

#define ANDROID_HARDWARE_DEVICES_FACTORY_HAL_INTERFACE_H



#include <media/audiohal/DeviceHalInterface.h>

#include <utils/Errors.h>

#include <utils/RefBase.h>



#include "DeviceHalInterface.h"



namespace android {



class DevicesFactoryHalInterface : public RefBase

services/audioflinger/EffectsFactoryHalInterface.h→include/media/audiohal/EffectsFactoryHalInterface.h

+1 −2
Original line number Diff line number Diff line
@@ -18,11 +18,10 @@ 
#define ANDROID_HARDWARE_EFFECTS_FACTORY_HAL_INTERFACE_H



#include <hardware/audio_effect.h>

#include <media/audiohal/EffectHalInterface.h>

#include <utils/Errors.h>

#include <utils/RefBase.h>



#include "EffectHalInterface.h"



namespace android {



class EffectsFactoryHalInterface : public RefBase

services/audioflinger/StreamHalInterface.h→include/media/audiohal/StreamHalInterface.h

+2 −3
Original line number Diff line number Diff line
@@ -17,13 +17,12 @@ 
#ifndef ANDROID_HARDWARE_STREAM_HAL_INTERFACE_H

#define ANDROID_HARDWARE_STREAM_HAL_INTERFACE_H



#include <hardware/audio_effect.h>

#include <hardware/audio.h>

#include <media/audiohal/EffectHalInterface.h>

#include <utils/Errors.h>

#include <utils/RefBase.h>

#include <utils/String8.h>



#include "EffectHalInterface.h"



namespace android {



class StreamHalInterface : public virtual RefBase