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

Commit cfbbfd6f authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Merge "AudioAttributes: fix setInternalCapturePreset()" into tm-qpr-dev am:... 

Merge "AudioAttributes: fix setInternalCapturePreset()" into tm-qpr-dev am: 5512643b am: f35090ee

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



Change-Id: Ifae46ba585c93db672d133801682c2b18c16a110
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e1fc31cc f35090ee

media/java/android/media/AudioAttributes.java

+4 −1
Original line number Diff line number Diff line
@@ -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);