Main thread call for audioSwitch selectDevice

@@ -57,7 +57,7 @@ constructor(private val context: Context) : AudioHandler {
     override fun start() {
     override fun start() {
         if (audioSwitch == null) {
         if (audioSwitch == null) {
             handler.removeCallbacksAndMessages(null)
             handler.removeCallbacksAndMessages(null)
-            handler.post {
+            handler.postAtFrontOfQueue {
                 val switch = AudioSwitch(
                 val switch = AudioSwitch(
                     context = context,
                     context = context,
                     loggingEnabled = loggingEnabled,
                     loggingEnabled = loggingEnabled,
@@ -73,7 +73,7 @@ constructor(private val context: Context) : AudioHandler {
 
 
     override fun stop() {
     override fun stop() {
         handler.removeCallbacksAndMessages(null)
         handler.removeCallbacksAndMessages(null)
-        handler.post {
+        handler.postAtFrontOfQueue {
             audioSwitch?.stop()
             audioSwitch?.stop()
             audioSwitch = null
             audioSwitch = null
         }
         }
@@ -86,8 +86,14 @@ constructor(private val context: Context) : AudioHandler {
         get() = audioSwitch?.availableAudioDevices ?: listOf()
         get() = audioSwitch?.availableAudioDevices ?: listOf()
 
 
     fun selectDevice(audioDevice: AudioDevice?) {
     fun selectDevice(audioDevice: AudioDevice?) {
+        if (Looper.myLooper() == Looper.getMainLooper()) {
+            audioSwitch?.selectDevice(audioDevice)
+        } else {
+            handler.post {
                 audioSwitch?.selectDevice(audioDevice)
                 audioSwitch?.selectDevice(audioDevice)
             }
             }
+        }
+    }
 
 
     companion object {
     companion object {
         private val defaultOnAudioFocusChangeListener by lazy(LazyThreadSafetyMode.NONE) {
         private val defaultOnAudioFocusChangeListener by lazy(LazyThreadSafetyMode.NONE) {