Fix/audiofocus (#18)

* fix: Return focus to previous focus owner using same AudioFocusRequest

* fix: Bump version

* fix: Revert patch number and update changelog

* fix: Rename test and supply matcher

* fix: Correct formatting

Author: cyodrew

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 0.1.1
+
+- Fixes bug that did not correctly abandon audio request after deactivate
+
 ### 0.1.0
 
 This release marks the first iteration of the AudioSwitch library: an Android audio management library for real-time communication apps.

audioswitch/src/main/java/com/twilio/audioswitch/selection/AudioDeviceManager.kt

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.content.pm.PackageManager
 import android.media.AudioDeviceInfo
+import android.media.AudioFocusRequest
 import android.media.AudioManager
 import android.os.Build
 import com.twilio.audioswitch.android.BuildWrapper
@@ -22,6 +23,7 @@ internal class AudioDeviceManager(
     private var savedAudioMode = 0
     private var savedIsMicrophoneMuted = false
     private var savedSpeakerphoneEnabled = false
+    private var audioRequest: AudioFocusRequest? = null
 
     fun hasEarpiece(): Boolean {
         val hasEarpiece = context.packageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)
@@ -54,7 +56,8 @@ internal class AudioDeviceManager(
     fun setAudioFocus() {
         // Request audio focus before making any device switch.
         if (build.getVersion() >= Build.VERSION_CODES.O) {
-            audioManager.requestAudioFocus(audioFocusRequest.buildRequest())
+            audioRequest = audioFocusRequest.buildRequest()
+            audioRequest?.let { audioManager.requestAudioFocus(it) }
         } else {
             audioManager.requestAudioFocus(
                     {},
@@ -93,6 +96,10 @@ internal class AudioDeviceManager(
         audioManager.mode = savedAudioMode
         mute(savedIsMicrophoneMuted)
         enableSpeakerphone(savedSpeakerphoneEnabled)
-        audioManager.abandonAudioFocus(null)
+        if (build.getVersion() >= Build.VERSION_CODES.O) {
+            audioRequest?.let { audioManager.abandonAudioFocusRequest(it) }
+        } else {
+            audioManager.abandonAudioFocus { }
+        }
     }
 }

audioswitch/src/test/java/com/twilio/audioswitch/selection/AudioDeviceSelectorTest.kt

@@ -298,6 +298,40 @@ class AudioDeviceSelectorTest {
         )
     }
 
+    @Test
+    fun `deactivate should abandon audio focus using pre Android O method if api version is 26`() {
+        whenever(buildWrapper.getVersion()).thenReturn(Build.VERSION_CODES.O)
+        val audioFocusRequest = mock<AudioFocusRequest>()
+        whenever(this.audioFocusRequest.buildRequest()).thenReturn(audioFocusRequest)
+        audioDeviceSelector.start(audioDeviceChangeListener)
+        audioDeviceSelector.activate()
+        audioDeviceSelector.stop()
+
+        verify(audioManager).abandonAudioFocusRequest(audioFocusRequest)
+    }
+
+    @Test
+    fun `deactivate should abandon audio focus using pre Android O method if api version is 27`() {
+        whenever(buildWrapper.getVersion()).thenReturn(Build.VERSION_CODES.O_MR1)
+        val audioFocusRequest = mock<AudioFocusRequest>()
+        whenever(this.audioFocusRequest.buildRequest()).thenReturn(audioFocusRequest)
+        audioDeviceSelector.start(audioDeviceChangeListener)
+        audioDeviceSelector.activate()
+        audioDeviceSelector.stop()
+
+        verify(audioManager).abandonAudioFocusRequest(audioFocusRequest)
+    }
+
+    @Test
+    fun `deactivate should abandon audio focus using pre Android O method if api version is 25`() {
+        whenever(buildWrapper.getVersion()).thenReturn(Build.VERSION_CODES.N_MR1)
+        audioDeviceSelector.start(audioDeviceChangeListener)
+        audioDeviceSelector.activate()
+        audioDeviceSelector.stop()
+
+        verify(audioManager).abandonAudioFocus(isA())
+    }
+
     @Test
     fun `activate should enable audio routing to the earpiece`() {
         audioDeviceSelector.start(audioDeviceChangeListener)