update

Author: VinayGuthal

firebase-ai/api.txt

@@ -893,7 +893,8 @@ package com.google.firebase.ai.type {
     method public suspend Object? send(String text, kotlin.coroutines.Continuation<? super kotlin.Unit>);
     method public suspend Object? sendFunctionResponse(java.util.List<com.google.firebase.ai.type.FunctionResponsePart> functionList, kotlin.coroutines.Continuation<? super kotlin.Unit>);
     method public suspend Object? sendMediaStream(java.util.List<com.google.firebase.ai.type.MediaData> mediaChunks, kotlin.coroutines.Continuation<? super kotlin.Unit>);
-    method @RequiresPermission(android.Manifest.permission.RECORD_AUDIO) public suspend Object? startAudioConversation(kotlin.jvm.functions.Function1<? super com.google.firebase.ai.type.FunctionCallPart,com.google.firebase.ai.type.FunctionResponsePart>? functionCallHandler = null, Boolean? enableInterruptions = null, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+    method @RequiresPermission(android.Manifest.permission.RECORD_AUDIO) public suspend Object? startAudioConversation(kotlin.jvm.functions.Function1<? super com.google.firebase.ai.type.FunctionCallPart,com.google.firebase.ai.type.FunctionResponsePart>? functionCallHandler = null, boolean enableInterruptions = false, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+    method @RequiresPermission(android.Manifest.permission.RECORD_AUDIO) public suspend Object? startAudioConversation(kotlin.jvm.functions.Function1<? super com.google.firebase.ai.type.FunctionCallPart,com.google.firebase.ai.type.FunctionResponsePart>? functionCallHandler = null, kotlin.coroutines.Continuation<? super kotlin.Unit>);
     method public void stopAudioConversation();
     method public void stopReceiving();
   }

firebase-ai/src/main/kotlin/com/google/firebase/ai/common/util/android.kt

@@ -17,6 +17,7 @@
 package com.google.firebase.ai.common.util
 
 import android.media.AudioRecord
+import kotlin.time.Duration.Companion.milliseconds
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.yield
@@ -39,7 +40,7 @@ internal fun AudioRecord.readAsFlow() = flow {
 
   while (true) {
     if (recordingState != AudioRecord.RECORDSTATE_RECORDING) {
-      delay(10)
+      delay(10.milliseconds)
       yield()
       continue
     }

firebase-ai/src/main/kotlin/com/google/firebase/ai/java/LiveSessionFutures.kt

@@ -63,10 +63,11 @@ public abstract class LiveSessionFutures internal constructor() {
    * Starts an audio conversation with the model, which can only be stopped using
    * [stopAudioConversation] or [close].
    *
-   * @param enableInterruptions Boolean to enable user to interrupt the model. Setting this variable
-   * would allow the user to talk while the model is responding.
+   * @param enableInterruptions If enabled, allows the user to speak over or interrupt the model's
+   * ongoing reply.
    *
-   * **WARNING**: User interruption might not work reliably across all devices.
+   * **WARNING**: The user interruption feature relies on device-specific support, and may not be
+   * consistently available.
    */
   @RequiresPermission(RECORD_AUDIO)
   public abstract fun startAudioConversation(enableInterruptions: Boolean): ListenableFuture<Unit>
@@ -78,10 +79,11 @@ public abstract class LiveSessionFutures internal constructor() {
    * @param functionCallHandler A callback function that is invoked whenever the model receives a
    * function call.
    *
-   * @param enableInterruptions Boolean to enable user to interrupt the model. Setting this variable
-   * would allow the user to talk while the model is responding.
+   * @param enableInterruptions If enabled, allows the user to speak over or interrupt the model's
+   * ongoing reply.
    *
-   * **WARNING**: User interruption might not work reliably across all devices.
+   * **WARNING**: The user interruption feature relies on device-specific support, and may not be
+   * consistently available.
    */
   @RequiresPermission(RECORD_AUDIO)
   public abstract fun startAudioConversation(

firebase-ai/src/main/kotlin/com/google/firebase/ai/type/LiveSession.kt

@@ -92,16 +92,32 @@ internal constructor(
    * @param functionCallHandler A callback function that is invoked whenever the model receives a
    * function call. The [FunctionResponsePart] that the callback function returns will be
    * automatically sent to the model.
+   */
+  @RequiresPermission(RECORD_AUDIO)
+  public suspend fun startAudioConversation(
+    functionCallHandler: ((FunctionCallPart) -> FunctionResponsePart)? = null
+  ) {
+    startAudioConversation(functionCallHandler, false)
+  }
+
+  /**
+   * Starts an audio conversation with the model, which can only be stopped using
+   * [stopAudioConversation] or [close].
    *
-   * @param enableInterruptions Boolean to enable user to interrupt the model. Setting this variable
-   * would allow the user to talk while the model is responding.
+   * @param functionCallHandler A callback function that is invoked whenever the model receives a
+   * function call. The [FunctionResponsePart] that the callback function returns will be
+   * automatically sent to the model.
+   *
+   * @param enableInterruptions If enabled, allows the user to speak over or interrupt the model's
+   * ongoing reply.
    *
-   * **WARNING**: User interruption might not work reliably across all devices.
+   * **WARNING**: The user interruption feature relies on device-specific support, and may not be
+   * consistently available.
    */
   @RequiresPermission(RECORD_AUDIO)
   public suspend fun startAudioConversation(
     functionCallHandler: ((FunctionCallPart) -> FunctionResponsePart)? = null,
-    enableInterruptions: Boolean? = null,
+    enableInterruptions: Boolean = false,
   ) {
 
     val context = firebaseApp.applicationContext
@@ -381,14 +397,14 @@ internal constructor(
    *
    * Launched asynchronously on [scope].
    */
-  private fun listenForModelPlayback(enableInterruptions: Boolean? = null) {
+  private fun listenForModelPlayback(enableInterruptions: Boolean = false) {
     scope.launch {
       while (isActive) {
         val playbackData = playBackQueue.poll()
         if (playbackData == null) {
           // The model playback queue is complete, so we can continue recording
           // TODO(b/408223520): Conditionally resume when param is added
-          if (enableInterruptions != true) {
+          if (!enableInterruptions) {
             audioHelper?.resumeRecording()
           }
           yield()