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

Commit b72c15ff authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Get declarations from the proper header file"

parents 6e6678a1 444841ff

services/audioflinger/AudioFlinger.h

+1 −2
Original line number Diff line number Diff line
@@ -71,12 +71,11 @@ 
#include <powermanager/IPowerManager.h>



#include <media/nbaio/NBLog.h>

#include <private/media/AudioEffectShared.h>

#include <private/media/AudioTrackShared.h>



namespace android {



struct audio_track_cblk_t;

struct effect_param_cblk_t;

class AudioMixer;

class AudioBuffer;

class AudioResampler;

services/audioflinger/Effects.cpp

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include "Configuration.h"

#include <utils/Log.h>

#include <audio_utils/primitives.h>

#include <private/media/AudioEffectShared.h>

#include <media/audiohal/EffectHalInterface.h>

#include <media/audiohal/EffectsFactoryHalInterface.h>

#include <system/audio_effects/effect_visualizer.h>