From c69efbffd2fd21103d3ef43d7fc80b28357b5aa6 Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Fri, 24 Mar 2017 11:11:48 -0700 Subject: [PATCH] Don't enable speakerphone when video enabled if headset on Fixes #6431 // FREEBIE --- .../thoughtcrime/securesms/service/WebRtcCallService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/org/thoughtcrime/securesms/service/WebRtcCallService.java b/src/org/thoughtcrime/securesms/service/WebRtcCallService.java index ab722b5813..119ee0aecd 100644 --- a/src/org/thoughtcrime/securesms/service/WebRtcCallService.java +++ b/src/org/thoughtcrime/securesms/service/WebRtcCallService.java @@ -748,7 +748,11 @@ public class WebRtcCallService extends Service implements InjectableType, PeerCo else this.lockManager.updatePhoneState(LockManager.PhoneState.IN_CALL); } - if (localVideoEnabled && !audioManager.isSpeakerphoneOn() && !audioManager.isBluetoothScoOn()) { + if (localVideoEnabled && + !audioManager.isSpeakerphoneOn() && + !audioManager.isBluetoothScoOn() && + !audioManager.isWiredHeadsetOn()) + { audioManager.setSpeakerphoneOn(true); }