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

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

Merge "Fix incorrect includes of AudioTrack.h"

parents adf10837 a6dafea1

core/jni/android_media_AudioSystem.cpp

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include "android_runtime/AndroidRuntime.h"



#include <media/AudioSystem.h>

#include <media/AudioTrack.h>



#include <system/audio.h>

#include <system/audio_policy.h>

include/media/AudioRecord.h

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 


#include <media/IAudioFlinger.h>

#include <media/IAudioRecord.h>

#include <media/AudioTrack.h>



#include <utils/RefBase.h>

#include <utils/Errors.h>
@@ -34,6 +33,8 @@ 


namespace android {



class audio_track_cblk_t;



// ----------------------------------------------------------------------------



class AudioRecord

media/libmedia/mediaplayer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include <gui/SurfaceTextureClient.h>



#include <media/mediaplayer.h>

#include <media/AudioTrack.h>

#include <media/AudioSystem.h>



#include <surfaceflinger/Surface.h>

media/libmediaplayerservice/MediaPlayerService.h

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 


namespace android {



class AudioTrack;

class IMediaRecorder;

class IMediaMetadataRetriever;

class IOMX;

media/libmediaplayerservice/MediaRecorderClient.cpp

+0 −2
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ 


#include <utils/String16.h>



#include <media/AudioTrack.h>



#include <system/audio.h>



#include "MediaRecorderClient.h"