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

Commit 7075dc6a authored by Mikhail Naganov's avatar Mikhail Naganov Committed by android-build-merger
Browse files

Merge "Move ExtendedAudioBufferProvider and SingleStateQueue" am: 2a70a39f... 

Merge "Move ExtendedAudioBufferProvider and SingleStateQueue" am: 2a70a39f am: 72d2412c am: 1cae73f3
am: 5fdaa0f7

Change-Id: I9d5daa6051e7d047c5fe403988be2174a999a79b
parents 7cd4830d 5fdaa0f7

include/media/ExtendedAudioBufferProvider.h

+1 −1
Original line number Diff line number Diff line 
../../media/libmedia/include/media/ExtendedAudioBufferProvider.h
 
 No newline at end of file
 
../../media/libaudioclient/include/media/ExtendedAudioBufferProvider.h
 
 No newline at end of file

include/media/SingleStateQueue.h

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
../../media/libmedia/include/media/SingleStateQueue.h
 
 No newline at end of file

include/media/nbaio/SingleStateQueue.h

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../../../media/libnbaio/include_mono/media/nbaio/SingleStateQueue.h
 
 No newline at end of file

include/private/media/AudioTrackShared.h

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <media/AudioResamplerPublic.h>

#include <media/AudioTimestamp.h>

#include <media/Modulo.h>

#include <media/SingleStateQueue.h>

#include <media/nbaio/SingleStateQueue.h>



namespace android {