Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-22 12:08:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix proximity locking during voice calls.

Browse Source
This commit is contained in:
Alex Hart
2025-08-13 12:39:02 -03:00
committed by GitHub
parent 0bbbee645d
commit 58d2fbc94e
1 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/AudioManagerCompat.java
View File

@@ -97,11 +97,36 @@ public abstract class AudioManagerCompat {
}
public boolean isSpeakerphoneOn() {
return audioManager.isSpeakerphoneOn();
if (Build.VERSION.SDK_INT >= 31) {
AudioDeviceInfo audioDeviceInfo = getCommunicationDevice();
if (audioDeviceInfo == null) {
Log.w(TAG, "isSpeakerphoneOn: Failed to find communication device.");
return false;
} else {
return audioDeviceInfo.getType() == AudioDeviceInfo.TYPE_BUILTIN_SPEAKER;
}
} else {
return audioManager.isSpeakerphoneOn();
}
}
public void setSpeakerphoneOn(boolean on) {
audioManager.setSpeakerphoneOn(on);
if (Build.VERSION.SDK_INT >= 31) {
int desiredType = on ? AudioDeviceInfo.TYPE_BUILTIN_SPEAKER : AudioDeviceInfo.TYPE_BUILTIN_EARPIECE;
AudioDeviceInfo candidate = getAvailableCommunicationDevices().stream()
.filter(audioDeviceInfo -> audioDeviceInfo.getType() == desiredType)
.findFirst()
.orElse(null);
if (candidate != null) {
setCommunicationDevice(candidate);
} else {
Log.w(TAG, "setSpeakerphoneOn: Failed to find candidate for device type {" + desiredType + "}. Falling back on deprecated method.");
audioManager.setSpeakerphoneOn(on);
}
} else {
audioManager.setSpeakerphoneOn(on);
}
}
public boolean isMicrophoneMute() {