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

Commit 54f5501a authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "Temporary workaround for issue 3187563"

parents a628f895 e3aac34f

services/camera/libcameraservice/CameraService.cpp

+4 −0
Original line number Original line Diff line number Diff line
@@ -277,6 +277,10 @@ void CameraService::releaseSound() { 




void CameraService::playSound(sound_kind kind) {

void CameraService::playSound(sound_kind kind) {

    LOG1("playSound(%d)", kind);

    LOG1("playSound(%d)", kind);

    // FIXME: temporarily disable sound while working on audio HAL issues preventing simultaneous

    // playback and record

    if (kind == SOUND_RECORDING) return;



    Mutex::Autolock lock(mSoundLock);

    Mutex::Autolock lock(mSoundLock);

    sp<MediaPlayer> player = mSoundPlayer[kind];

    sp<MediaPlayer> player = mSoundPlayer[kind];

    if (player != 0) {

    if (player != 0) {