Merge "AudioAttributes: fix setInternalCapturePreset()" into tm-qpr-dev am: 5512643bd5 am: f35090ee00

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21335158

Change-Id: Ifae46ba585c93db672d133801682c2b18c16a110
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eric Laurent
2023-02-08 15:43:00 +00:00
committed by Automerger Merge Worker

View File

@@ -1275,7 +1275,10 @@ public final class AudioAttributes implements Parcelable {
|| (preset == MediaRecorder.AudioSource.VOICE_UPLINK)
|| (preset == MediaRecorder.AudioSource.VOICE_CALL)
|| (preset == MediaRecorder.AudioSource.ECHO_REFERENCE)
|| (preset == MediaRecorder.AudioSource.ULTRASOUND)) {
|| (preset == MediaRecorder.AudioSource.ULTRASOUND)
// AUDIO_SOURCE_INVALID is used by convention on default initialized
// audio attributes
|| (preset == MediaRecorder.AudioSource.AUDIO_SOURCE_INVALID)) {
mSource = preset;
} else {
setCapturePreset(preset);