diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 01:42:34 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 01:42:34 +0000 |
| commit | 7c35dac75c2fc02470620e16c482c366884f6850 (patch) | |
| tree | 7fb9e3edbdbb972e722566e938542214e9b08380 | |
| parent | bd4093dc8f7bca7fc2c3850eaf72ec68bc798664 (diff) | |
| parent | b4e379dd5a7dc764260ace7b73a782077ff10232 (diff) | |
| download | android_frameworks_wilhelm-stable/cm-13.0-ZNH2KB.tar.gz android_frameworks_wilhelm-stable/cm-13.0-ZNH2KB.tar.bz2 android_frameworks_wilhelm-stable/cm-13.0-ZNH2KB.zip | |
Merge tag 'android-6.0.0_r26' into HEADHEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kstable/cm-13.0-ZNH0Ecm-13.0
Android 6.0.0 release 26
Change-Id: Ifba59fec6c74cabe1d5381e6d48e5c087f1d6780
| -rw-r--r-- | src/android/AudioPlayer_to_android.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ SLresult android_audioPlayer_realize(CAudioPlayer *pAudioPlayer, SLboolean async 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; } |