Merge tag 'android-6.0.0_r26' into HEAD
Android 6.0.0 release 26
* tag 'android-6.0.0_r26':
Force RAW to reduce latency on platforms that support it
Conflicts:
src/android/AudioPlayer_to_android.cpp
Change-Id: I4a27e4e85b2a96a07717d970c2955d2c791c4927
diff --git a/src/android/AudioPlayer_to_android.cpp b/src/android/AudioPlayer_to_android.cpp
index 1cc60a7..9d30a30 100644
--- a/src/android/AudioPlayer_to_android.cpp
+++ b/src/android/AudioPlayer_to_android.cpp
@@ -1464,7 +1464,7 @@
audio_output_flags_t policy;
if (canUseFastTrack(pAudioPlayer)) {
- policy = (audio_output_flags_t)(AUDIO_OUTPUT_FLAG_FAST|AUDIO_OUTPUT_FLAG_RAW);
+ policy = (audio_output_flags_t)(AUDIO_OUTPUT_FLAG_FAST | AUDIO_OUTPUT_FLAG_RAW);
} else {
policy = AUDIO_OUTPUT_FLAG_NONE;
}