jp/baresip-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed AudioManager related SDK version test

Browse Source
This commit is contained in:
Juha Heinanen
2023-07-16 21:26:08 +03:00
parent 0e36d376d2
commit 1eec5425b1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/Utils.kt
+4 -4
View File
@@ -899,14 +899,14 @@ object Utils {
} }
fun isSpeakerPhoneOn(am: AudioManager): Boolean { fun isSpeakerPhoneOn(am: AudioManager): Boolean {
return if (Build.VERSION.SDK_INT > 33) return if (Build.VERSION.SDK_INT >= 31)
am.communicationDevice!!.type == AudioDeviceInfo.TYPE_BUILTIN_SPEAKER am.communicationDevice!!.type == AudioDeviceInfo.TYPE_BUILTIN_SPEAKER
else else
am.isSpeakerphoneOn am.isSpeakerphoneOn
} }
private fun setSpeakerPhone(executor: Executor, am: AudioManager, enable: Boolean) { private fun setSpeakerPhone(executor: Executor, am: AudioManager, enable: Boolean) {
if (Build.VERSION.SDK_INT > 33) { if (Build.VERSION.SDK_INT >= 31) {
val current = am.communicationDevice!!.type val current = am.communicationDevice!!.type
Log.d(TAG, "Current com dev/mode is $current/${am.mode}") Log.d(TAG, "Current com dev/mode is $current/${am.mode}")
var speakerDevice: AudioDeviceInfo? = null var speakerDevice: AudioDeviceInfo? = null
@@ -971,7 +971,7 @@ object Utils {
} }
fun toggleSpeakerPhone(executor: Executor, am: AudioManager) { fun toggleSpeakerPhone(executor: Executor, am: AudioManager) {
if (Build.VERSION.SDK_INT > 33) { if (Build.VERSION.SDK_INT >= 31) {
if (am.communicationDevice!!.type == AudioDeviceInfo.TYPE_BUILTIN_EARPIECE) if (am.communicationDevice!!.type == AudioDeviceInfo.TYPE_BUILTIN_EARPIECE)
setSpeakerPhone(executor, am, true) setSpeakerPhone(executor, am, true)
else if (am.communicationDevice!!.type == AudioDeviceInfo.TYPE_BUILTIN_SPEAKER) else if (am.communicationDevice!!.type == AudioDeviceInfo.TYPE_BUILTIN_SPEAKER)
@@ -994,7 +994,7 @@ object Utils {
} }
private fun clearCommunicationDevice(am: AudioManager) { private fun clearCommunicationDevice(am: AudioManager) {
if (Build.VERSION.SDK_INT > 33) { if (Build.VERSION.SDK_INT >= 31) {
am.clearCommunicationDevice() am.clearCommunicationDevice()
} else { } else {
if (am.isSpeakerphoneOn) if (am.isSpeakerphoneOn)