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

Commit 922261de authored by Dima Zavin's avatar Dima Zavin Committed by Android (Google) Code Review
Browse files

Merge "audio: update for audio/audio_policy header names/locations"

parents 82f0a85c 290029d1

core/jni/android_media_AudioSystem.cpp

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



#include <system/audio.h>

#include <hardware/audio_policy.h>

#include <system/audio_policy.h>



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

include/media/AudioSystem.h

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



#include <system/audio.h>

#include <hardware/audio_policy.h>

#include <system/audio_policy.h>



/* XXX: Should be include by all the users instead */

#include <media/AudioParameter.h>

include/media/IAudioPolicyService.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <binder/IInterface.h>

#include <media/AudioSystem.h>



#include <hardware/audio_policy.h>

#include <system/audio_policy.h>



namespace android {

media/libmedia/AudioTrack.cpp

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#include <cutils/bitops.h>



#include <system/audio.h>

#include <hardware/audio_policy.h>

#include <system/audio_policy.h>



#define LIKELY( exp )       (__builtin_expect( (exp) != 0, true  ))

#define UNLIKELY( exp )     (__builtin_expect( (exp) != 0, false ))

services/audioflinger/AudioFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
#include <private/media/AudioEffectShared.h>



#include <system/audio.h>

#include <hardware/audio_hal.h>

#include <hardware/audio.h>



#include "AudioMixer.h"

#include "AudioFlinger.h"