Replace Twilio's AudioSwitch library with a custom implementation

demo-app/build.gradle.kts

@@ -290,8 +290,6 @@ dependencies {
     // Http
     implementation(libs.okhttp)
 
-    implementation(libs.audioswitch)
-
     // Logging
     implementation(libs.okhttp.logging)
 

demo-app/src/androidTestE2etestingDebug/kotlin/io/getstream/video/android/tests/StreamTestCase.kt

@@ -18,7 +18,6 @@ package io.getstream.video.android.tests
 
 import android.Manifest.permission.ACCESS_FINE_LOCATION
 import android.Manifest.permission.BLUETOOTH_ADVERTISE
-import android.Manifest.permission.BLUETOOTH_CONNECT
 import android.Manifest.permission.BLUETOOTH_SCAN
 import android.Manifest.permission.CAMERA
 import android.Manifest.permission.POST_NOTIFICATIONS
@@ -80,7 +79,6 @@ abstract class StreamTestCase {
             ACCESS_FINE_LOCATION,
             BLUETOOTH_ADVERTISE,
             BLUETOOTH_SCAN,
-            BLUETOOTH_CONNECT,
         )
         for (permission in permissions) {
             device.grantPermission(permission)

demo-app/src/main/kotlin/io/getstream/video/android/ui/menu/SettingsMenu.kt

@@ -216,11 +216,45 @@ internal fun SettingsMenu(
             is StreamAudioDevice.Speakerphone -> Icons.Default.SpeakerPhone
             is StreamAudioDevice.WiredHeadset -> Icons.Default.HeadsetMic
         }
+        // Compare devices by type and audioDeviceInfo ID (if available) since audio can be null when using custom audio switch
+        val selected = selectedMicroPhoneDevice
+        val isSelected = when {
+            selected == null -> false
+            else -> {
+                // First try to compare by audioDeviceInfo ID if both have it
+                val itInfoId = when (it) {
+                    is StreamAudioDevice.BluetoothHeadset -> it.audioDeviceInfo?.id
+                    is StreamAudioDevice.WiredHeadset -> it.audioDeviceInfo?.id
+                    is StreamAudioDevice.Earpiece -> it.audioDeviceInfo?.id
+                    is StreamAudioDevice.Speakerphone -> it.audioDeviceInfo?.id
+                }
+                val selectedInfoId = when (selected) {
+                    is StreamAudioDevice.BluetoothHeadset -> selected.audioDeviceInfo?.id
+                    is StreamAudioDevice.WiredHeadset -> selected.audioDeviceInfo?.id
+                    is StreamAudioDevice.Earpiece -> selected.audioDeviceInfo?.id
+                    is StreamAudioDevice.Speakerphone -> selected.audioDeviceInfo?.id
+                }
+
+                if (itInfoId != null && selectedInfoId != null) {
+                    // Both have audioDeviceInfo, compare by ID
+                    itInfoId == selectedInfoId
+                } else {
+                    // Fall back to type comparison
+                    when {
+                        it is StreamAudioDevice.BluetoothHeadset && selected is StreamAudioDevice.BluetoothHeadset -> true
+                        it is StreamAudioDevice.WiredHeadset && selected is StreamAudioDevice.WiredHeadset -> true
+                        it is StreamAudioDevice.Earpiece && selected is StreamAudioDevice.Earpiece -> true
+                        it is StreamAudioDevice.Speakerphone && selected is StreamAudioDevice.Speakerphone -> true
+                        else -> false
+                    }
+                }
+            }
+        }
         AudioDeviceUiState(
             it,
             it.name,
             icon,
-            it.audio.name == selectedMicroPhoneDevice?.audio?.name,
+            isSelected,
         )
     }
 

gradle/libs.versions.toml

@@ -38,7 +38,6 @@ coil = "2.6.0"
 landscapist = "2.4.2"
 accompanist = "0.34.0"
 telephoto = "0.3.0"
-audioswitch = "1.2.0"
 libyuv = "0.36.0"
 
 wire = "4.7.0"
@@ -139,8 +138,6 @@ accompanist-permission = { group = "com.google.accompanist", name = "accompanist
 stream-video-android-noise-cancellation = { module = "io.getstream:stream-video-android-noise-cancellation", version.ref = "streamNoiseCancellation" }
 telephoto = { group = "me.saket.telephoto", name = "zoomable", version.ref = "telephoto"  }
 
-audioswitch = { group = "com.twilio", name = "audioswitch", version.ref = "audioswitch"}
-
 libyuv = { group = "io.github.crow-misia.libyuv", name = "libyuv-android", version.ref = "libyuv"}
 
 wire-runtime = { group = "com.squareup.wire", name = "wire-runtime", version.ref = "wire" }

stream-video-android-core/api/stream-video-android-core.api

@@ -8503,85 +8503,79 @@ public abstract interface class io/getstream/video/android/core/api/SignalServer
 }
 
 public abstract interface class io/getstream/video/android/core/audio/AudioHandler {
+	public abstract fun selectDevice (Lio/getstream/video/android/core/audio/StreamAudioDevice;)V
 	public abstract fun start ()V
 	public abstract fun stop ()V
 }
 
-public final class io/getstream/video/android/core/audio/AudioSwitchHandler : io/getstream/video/android/core/audio/AudioHandler {
-	public static final field Companion Lio/getstream/video/android/core/audio/AudioSwitchHandler$Companion;
-	public fun <init> (Landroid/content/Context;Ljava/util/List;Lkotlin/jvm/functions/Function2;)V
-	public final fun selectDevice (Lcom/twilio/audioswitch/AudioDevice;)V
-	public fun start ()V
-	public fun stop ()V
-}
-
-public final class io/getstream/video/android/core/audio/AudioSwitchHandler$Companion {
-}
-
 public abstract class io/getstream/video/android/core/audio/StreamAudioDevice {
 	public static final field Companion Lio/getstream/video/android/core/audio/StreamAudioDevice$Companion;
-	public static final fun fromAudio (Lcom/twilio/audioswitch/AudioDevice;)Lio/getstream/video/android/core/audio/StreamAudioDevice;
-	public abstract fun getAudio ()Lcom/twilio/audioswitch/AudioDevice;
+	public static final fun fromAudioDeviceInfo (Landroid/media/AudioDeviceInfo;)Lio/getstream/video/android/core/audio/StreamAudioDevice;
+	public abstract fun getAudioDeviceInfo ()Landroid/media/AudioDeviceInfo;
 	public abstract fun getName ()Ljava/lang/String;
-	public static final fun toAudioDevice (Lio/getstream/video/android/core/audio/StreamAudioDevice;)Lcom/twilio/audioswitch/AudioDevice;
+	public static final fun toAudioDeviceInfo (Lio/getstream/video/android/core/audio/StreamAudioDevice;Landroid/media/AudioManager;)Landroid/media/AudioDeviceInfo;
 }
 
 public final class io/getstream/video/android/core/audio/StreamAudioDevice$BluetoothHeadset : io/getstream/video/android/core/audio/StreamAudioDevice {
-	public fun <init> (Ljava/lang/String;Lcom/twilio/audioswitch/AudioDevice;)V
-	public synthetic fun <init> (Ljava/lang/String;Lcom/twilio/audioswitch/AudioDevice;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> ()V
+	public fun <init> (Ljava/lang/String;Landroid/media/AudioDeviceInfo;)V
+	public synthetic fun <init> (Ljava/lang/String;Landroid/media/AudioDeviceInfo;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Lcom/twilio/audioswitch/AudioDevice;
-	public final fun copy (Ljava/lang/String;Lcom/twilio/audioswitch/AudioDevice;)Lio/getstream/video/android/core/audio/StreamAudioDevice$BluetoothHeadset;
-	public static synthetic fun copy$default (Lio/getstream/video/android/core/audio/StreamAudioDevice$BluetoothHeadset;Ljava/lang/String;Lcom/twilio/audioswitch/AudioDevice;ILjava/lang/Object;)Lio/getstream/video/android/core/audio/StreamAudioDevice$BluetoothHeadset;
+	public final fun component2 ()Landroid/media/AudioDeviceInfo;
+	public final fun copy (Ljava/lang/String;Landroid/media/AudioDeviceInfo;)Lio/getstream/video/android/core/audio/StreamAudioDevice$BluetoothHeadset;
+	public static synthetic fun copy$default (Lio/getstream/video/android/core/audio/StreamAudioDevice$BluetoothHeadset;Ljava/lang/String;Landroid/media/AudioDeviceInfo;ILjava/lang/Object;)Lio/getstream/video/android/core/audio/StreamAudioDevice$BluetoothHeadset;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun getAudio ()Lcom/twilio/audioswitch/AudioDevice;
+	public fun getAudioDeviceInfo ()Landroid/media/AudioDeviceInfo;
 	public fun getName ()Ljava/lang/String;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }
 
 public final class io/getstream/video/android/core/audio/StreamAudioDevice$Companion {
-	public final fun fromAudio (Lcom/twilio/audioswitch/AudioDevice;)Lio/getstream/video/android/core/audio/StreamAudioDevice;
-	public final fun toAudioDevice (Lio/getstream/video/android/core/audio/StreamAudioDevice;)Lcom/twilio/audioswitch/AudioDevice;
+	public final fun fromAudioDeviceInfo (Landroid/media/AudioDeviceInfo;)Lio/getstream/video/android/core/audio/StreamAudioDevice;
+	public final fun toAudioDeviceInfo (Lio/getstream/video/android/core/audio/StreamAudioDevice;Landroid/media/AudioManager;)Landroid/media/AudioDeviceInfo;
 }
 
 public final class io/getstream/video/android/core/audio/StreamAudioDevice$Earpiece : io/getstream/video/android/core/audio/StreamAudioDevice {
-	public fun <init> (Ljava/lang/String;Lcom/twilio/audioswitch/AudioDevice;)V
-	public synthetic fun <init> (Ljava/lang/String;Lcom/twilio/audioswitch/AudioDevice;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> ()V
+	public fun <init> (Ljava/lang/String;Landroid/media/AudioDeviceInfo;)V
+	public synthetic fun <init> (Ljava/lang/String;Landroid/media/AudioDeviceInfo;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Lcom/twilio/audioswitch/AudioDevice;
-	public final fun copy (Ljava/lang/String;Lcom/twilio/audioswitch/AudioDevice;)Lio/getstream/video/android/core/audio/StreamAudioDevice$Earpiece;
-	public static synthetic fun copy$default (Lio/getstream/video/android/core/audio/StreamAudioDevice$Earpiece;Ljava/lang/String;Lcom/twilio/audioswitch/AudioDevice;ILjava/lang/Object;)Lio/getstream/video/android/core/audio/StreamAudioDevice$Earpiece;
+	public final fun component2 ()Landroid/media/AudioDeviceInfo;
+	public final fun copy (Ljava/lang/String;Landroid/media/AudioDeviceInfo;)Lio/getstream/video/android/core/audio/StreamAudioDevice$Earpiece;
+	public static synthetic fun copy$default (Lio/getstream/video/android/core/audio/StreamAudioDevice$Earpiece;Ljava/lang/String;Landroid/media/AudioDeviceInfo;ILjava/lang/Object;)Lio/getstream/video/android/core/audio/StreamAudioDevice$Earpiece;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun getAudio ()Lcom/twilio/audioswitch/AudioDevice;
+	public fun getAudioDeviceInfo ()Landroid/media/AudioDeviceInfo;
 	public fun getName ()Ljava/lang/String;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }
 
 public final class io/getstream/video/android/core/audio/StreamAudioDevice$Speakerphone : io/getstream/video/android/core/audio/StreamAudioDevice {
-	public fun <init> (Ljava/lang/String;Lcom/twilio/audioswitch/AudioDevice;)V
-	public synthetic fun <init> (Ljava/lang/String;Lcom/twilio/audioswitch/AudioDevice;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> ()V
+	public fun <init> (Ljava/lang/String;Landroid/media/AudioDeviceInfo;)V
+	public synthetic fun <init> (Ljava/lang/String;Landroid/media/AudioDeviceInfo;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Lcom/twilio/audioswitch/AudioDevice;
-	public final fun copy (Ljava/lang/String;Lcom/twilio/audioswitch/AudioDevice;)Lio/getstream/video/android/core/audio/StreamAudioDevice$Speakerphone;
-	public static synthetic fun copy$default (Lio/getstream/video/android/core/audio/StreamAudioDevice$Speakerphone;Ljava/lang/String;Lcom/twilio/audioswitch/AudioDevice;ILjava/lang/Object;)Lio/getstream/video/android/core/audio/StreamAudioDevice$Speakerphone;
+	public final fun component2 ()Landroid/media/AudioDeviceInfo;
+	public final fun copy (Ljava/lang/String;Landroid/media/AudioDeviceInfo;)Lio/getstream/video/android/core/audio/StreamAudioDevice$Speakerphone;
+	public static synthetic fun copy$default (Lio/getstream/video/android/core/audio/StreamAudioDevice$Speakerphone;Ljava/lang/String;Landroid/media/AudioDeviceInfo;ILjava/lang/Object;)Lio/getstream/video/android/core/audio/StreamAudioDevice$Speakerphone;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun getAudio ()Lcom/twilio/audioswitch/AudioDevice;
+	public fun getAudioDeviceInfo ()Landroid/media/AudioDeviceInfo;
 	public fun getName ()Ljava/lang/String;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }
 
 public final class io/getstream/video/android/core/audio/StreamAudioDevice$WiredHeadset : io/getstream/video/android/core/audio/StreamAudioDevice {
-	public fun <init> (Ljava/lang/String;Lcom/twilio/audioswitch/AudioDevice;)V
-	public synthetic fun <init> (Ljava/lang/String;Lcom/twilio/audioswitch/AudioDevice;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> ()V
+	public fun <init> (Ljava/lang/String;Landroid/media/AudioDeviceInfo;)V
+	public synthetic fun <init> (Ljava/lang/String;Landroid/media/AudioDeviceInfo;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Lcom/twilio/audioswitch/AudioDevice;
-	public final fun copy (Ljava/lang/String;Lcom/twilio/audioswitch/AudioDevice;)Lio/getstream/video/android/core/audio/StreamAudioDevice$WiredHeadset;
-	public static synthetic fun copy$default (Lio/getstream/video/android/core/audio/StreamAudioDevice$WiredHeadset;Ljava/lang/String;Lcom/twilio/audioswitch/AudioDevice;ILjava/lang/Object;)Lio/getstream/video/android/core/audio/StreamAudioDevice$WiredHeadset;
+	public final fun component2 ()Landroid/media/AudioDeviceInfo;
+	public final fun copy (Ljava/lang/String;Landroid/media/AudioDeviceInfo;)Lio/getstream/video/android/core/audio/StreamAudioDevice$WiredHeadset;
+	public static synthetic fun copy$default (Lio/getstream/video/android/core/audio/StreamAudioDevice$WiredHeadset;Ljava/lang/String;Landroid/media/AudioDeviceInfo;ILjava/lang/Object;)Lio/getstream/video/android/core/audio/StreamAudioDevice$WiredHeadset;
 	public fun equals (Ljava/lang/Object;)Z
-	public fun getAudio ()Lcom/twilio/audioswitch/AudioDevice;
+	public fun getAudioDeviceInfo ()Landroid/media/AudioDeviceInfo;
 	public fun getName ()Ljava/lang/String;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
@@ -8812,17 +8806,6 @@ public final class io/getstream/video/android/core/call/state/Reaction : io/gets
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class io/getstream/video/android/core/call/state/SelectAudioDevice : io/getstream/video/android/core/call/state/CallAction {
-	public fun <init> (Lcom/twilio/audioswitch/AudioDevice;)V
-	public final fun component1 ()Lcom/twilio/audioswitch/AudioDevice;
-	public final fun copy (Lcom/twilio/audioswitch/AudioDevice;)Lio/getstream/video/android/core/call/state/SelectAudioDevice;
-	public static synthetic fun copy$default (Lio/getstream/video/android/core/call/state/SelectAudioDevice;Lcom/twilio/audioswitch/AudioDevice;ILjava/lang/Object;)Lio/getstream/video/android/core/call/state/SelectAudioDevice;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAudioDevice ()Lcom/twilio/audioswitch/AudioDevice;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
 public final class io/getstream/video/android/core/call/state/Settings : io/getstream/video/android/core/call/state/CallAction {
 	public fun <init> (Z)V
 	public final fun component1 ()Z

stream-video-android-core/build.gradle.kts

@@ -134,8 +134,6 @@ dependencies {
     // webrtc
     api(libs.stream.webrtc)
 
-    implementation(libs.audioswitch)
-
     // video filter dependencies
     implementation(libs.libyuv)
 

stream-video-android-core/src/androidTest/AndroidManifest.xml

@@ -17,5 +17,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
 </manifest>

stream-video-android-core/src/androidTest/kotlin/io/getstream/video/android/core/MediaManagerTest.kt

@@ -37,7 +37,6 @@ class MediaManagerTest : IntegrationTestBase(connectCoordinatorWS = false) {
     var runtimePermissionRule = GrantPermissionRule.grant(
         Manifest.permission.CAMERA,
         Manifest.permission.RECORD_AUDIO,
-        Manifest.permission.BLUETOOTH_CONNECT,
     )
 
     @Before

stream-video-android-core/src/main/AndroidManifest.xml

@@ -26,7 +26,8 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <!-- Bluetooth permission for API < 31 -->
+    <uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />

stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/Call.kt

@@ -342,12 +342,13 @@ public class Call(
             testInstanceProvider.mediaManagerCreator!!.invoke()
         } else {
             MediaManagerImpl(
-                clientImpl.context,
-                this,
-                scope,
-                eglBase.eglBaseContext,
-                clientImpl.callServiceConfigRegistry.get(type).audioUsage,
-            ) { clientImpl.callServiceConfigRegistry.get(type).audioUsage }
+                context = clientImpl.context,
+                call = this,
+                scope = scope,
+                eglBaseContext = eglBase.eglBaseContext,
+                audioUsage = clientImpl.callServiceConfigRegistry.get(type).audioUsage,
+                audioUsageProvider = { clientImpl.callServiceConfigRegistry.get(type).audioUsage },
+            )
         }
     }
 
@@ -1351,7 +1352,9 @@ public class Call(
     private fun monitorHeadset() {
         microphone.devices.onEach { availableDevices ->
             logger.d {
-                "[monitorHeadset] new available devices, prev selected: ${microphone.nonHeadsetFallbackDevice}"
+                "[monitorHeadset] new available devices, prev selected: ${
+                    microphone.nonHeadsetFallbackDevice
+                }"
             }
 
             val bluetoothHeadset =