Fix: [Android] Expose helper to clearCommunicationDevice on AudioManager.AUDIOFOCUS_LOSS (flutter-webrtc#1410)

chrisflutterdev · web-flow · commit 5e6e3daa7cf4 · 2023-08-09T09:11:41.000+08:00
* clearCommunicationDevice on AudioManager.AUDIOFOCUS_LOSS

Expose helper method to clearCommunicationDevice

* Fix file formatting
diff --git a/android/src/main/java/com/cloudwebrtc/webrtc/MethodCallHandlerImpl.java b/android/src/main/java/com/cloudwebrtc/webrtc/MethodCallHandlerImpl.java
@@ -538,6 +538,10 @@ public void onMethodCall(MethodCall call, @NonNull Result notSafeResult) {
         result.success(null);
         break;
       }
+      case "clearAndroidCommunicationDevice": {
+        AudioSwitchManager.instance.clearCommunicationDevice();
+        break;
+      }
       case "setMicrophoneMute":
         boolean mute = call.argument("mute");
         AudioSwitchManager.instance.setMicrophoneMute(mute);
diff --git a/android/src/main/java/com/cloudwebrtc/webrtc/audio/AudioSwitchManager.java b/android/src/main/java/com/cloudwebrtc/webrtc/audio/AudioSwitchManager.java
@@ -255,6 +255,9 @@ public void setFocusMode(@Nullable String focusModeString) {
             case "gainTransientMayDuck":
                 focusMode = AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK;
                 break;
+            case "loss":
+                focusMode = AudioManager.AUDIOFOCUS_LOSS;
+                break;
             default:
                 Log.w(TAG, "Unknown audio focus mode: " + focusModeString);
                 break;
@@ -268,4 +271,8 @@ public void setFocusMode(@Nullable String focusModeString) {
             }
         }
     }
+
+    public void clearCommunicationDevice() {
+        audioManager.clearCommunicationDevice();
+    }
 }
diff --git a/lib/src/helper.dart b/lib/src/helper.dart
@@ -129,6 +129,10 @@ class Helper {
       AndroidNativeAudioManagement.setAndroidAudioConfiguration(
           androidAudioConfiguration);
 
+  /// After Android app finishes a session, on audio focus loss, clear the active communication device.
+  static Future<void> clearAndroidCommunicationDevice() =>
+      WebRTC.invokeMethod('clearAndroidCommunicationDevice');
+
   /// Set the audio configuration for iOS
   static Future<void> setAppleAudioConfiguration(
           AppleAudioConfiguration appleAudioConfiguration) =>
diff --git a/lib/src/native/android/audio_configuration.dart b/lib/src/native/android/audio_configuration.dart
@@ -24,6 +24,7 @@ enum AndroidAudioFocusMode {
   gainTransient,
   gainTransientExclusive,
   gainTransientMayDuck,
+  loss
 }
 
 extension AndroidAudioFocusModeExt on AndroidAudioFocusMode {

Original file line number	Diff line number	Diff line change
`@@ -255,6 +255,9 @@ public void setFocusMode(@Nullable String focusModeString) {`
`255`	`255`	`case "gainTransientMayDuck":`
`256`	`256`	`focusMode = AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK;`
`257`	`257`	`break;`
	`258`	`+ case "loss":`
	`259`	`+ focusMode = AudioManager.AUDIOFOCUS_LOSS;`
	`260`	`+ break;`
`258`	`261`	`default:`
`259`	`262`	`Log.w(TAG, "Unknown audio focus mode: " + focusModeString);`
`260`	`263`	`break;`
`@@ -268,4 +271,8 @@ public void setFocusMode(@Nullable String focusModeString) {`
`268`	`271`	`}`
`269`	`272`	`}`
`270`	`273`	`}`
	`274`	`+`
	`275`	`+ public void clearCommunicationDevice() {`
	`276`	`+ audioManager.clearCommunicationDevice();`
	`277`	`+ }`
`271`	`278`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ enum AndroidAudioFocusMode {`
`24`	`24`	`gainTransient,`
`25`	`25`	`gainTransientExclusive,`
`26`	`26`	`gainTransientMayDuck,`
	`27`	`+ loss`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`extension AndroidAudioFocusModeExt on AndroidAudioFocusMode {`