Merge remote-tracking branch 'origin/main' into emb/fcm-v1-reg

Author: eldhosembabu

ai-logic/firebase-ai/src/androidTest/kotlin/com/google/firebase/ai/AIModels.kt

@@ -28,8 +28,10 @@ class AIModels {
     var app: FirebaseApp? = null
     lateinit var vertexAIFlashModel: GenerativeModel
     lateinit var vertexAIFlashLiteModel: GenerativeModel
+    lateinit var vertexAI3_5FlashModel: GenerativeModel
     lateinit var googleAIFlashModel: GenerativeModel
     lateinit var googleAIFlashLiteModel: GenerativeModel
+    lateinit var googleAI3_5FlashModel: GenerativeModel
     lateinit var vertexAITemplateModel: TemplateGenerativeModel
     lateinit var googleAITemplateModel: TemplateGenerativeModel
 
@@ -41,8 +43,10 @@ class AIModels {
       return listOf(
         vertexAIFlashModel,
         vertexAIFlashLiteModel,
+        vertexAI3_5FlashModel,
         googleAIFlashModel,
-        googleAIFlashLiteModel
+        googleAIFlashLiteModel,
+        googleAI3_5FlashModel,
       )
     }
 
@@ -66,6 +70,11 @@ class AIModels {
           .generativeModel(
             modelName = "gemini-2.5-flash-lite",
           )
+      vertexAI3_5FlashModel =
+        FirebaseAI.getInstance(app!!, GenerativeBackend.vertexAI("global"))
+          .generativeModel(
+            modelName = "gemini-3.5-flash",
+          )
       googleAIFlashModel =
         FirebaseAI.getInstance(app!!, GenerativeBackend.googleAI())
           .generativeModel(
@@ -76,6 +85,11 @@ class AIModels {
           .generativeModel(
             modelName = "gemini-2.5-flash-lite",
           )
+      googleAI3_5FlashModel =
+        FirebaseAI.getInstance(app!!, GenerativeBackend.googleAI())
+          .generativeModel(
+            modelName = "gemini-3.5-flash",
+          )
       vertexAITemplateModel =
         FirebaseAI.getInstance(app!!, GenerativeBackend.vertexAI()).templateGenerativeModel()
       googleAITemplateModel =

firebase-dataconnect/CHANGELOG.md

@@ -9,6 +9,9 @@
   as the random numbers were not used in a security-sensitive context,
   thus the performance costs of secure random number generation were unnecessary.
   ([#8154](https://github.com/firebase/firebase-android-sdk/pull/8154))
+- [fixed] Queries executed with FetchPolicy.CACHE_ONLY now fail, as expected,
+  if local caching is not enabled, instead of behaving like SERVER_ONLY.
+  ([#8214](https://github.com/firebase/firebase-android-sdk/pull/8214))
 
 # 17.2.2
 

firebase-dataconnect/scripts/headless_android_emulator_run.zsh

@@ -23,12 +23,14 @@ show_help() {
   say "This can be useful for running instrumentation tests"
   say "without the overhead of rendering the Android UI."
   say
-  say "Syntax: $0 [avd]"
+  say "Syntax: $0 [avd] [-- emulator_flags...]"
   say
   say "The AVD to use may be specified as the first argument,"
   say "and _must_ be specified if there is more than one AVD"
   say "configured in the Android emulator."
   say
+  say "Any arguments after '--' are passed directly to the emulator command."
+  say
   say "The ANDROID_HOME environment variable must be set and is used"
   say "to find the Android emulator binary."
 }
@@ -39,10 +41,22 @@ if (( ${#opt_help} )); then
   show_help
   exit 0
 fi
-if (( # == 1 )); then
-  typeset -r emulator_avd="$1"
-elif (( # > 1 )); then
-  say_error "unexpected command-line argument: $2" >&2
+
+typeset -i double_dash_index=${@[(i)--]}
+typeset -a script_args
+typeset -a emulator_extra_args
+if (( double_dash_index <= $# )); then
+  script_args=( "${@[1,double_dash_index-1]}" )
+  emulator_extra_args=( "${@[double_dash_index+1,$#]}" )
+else
+  script_args=( "$@" )
+  emulator_extra_args=( )
+fi
+
+if (( ${#script_args} == 1 )); then
+  typeset -r emulator_avd="${script_args[1]}"
+elif (( ${#script_args} > 1 )); then
+  say_error "unexpected command-line argument: ${script_args[2]}" >&2
   sayp "Run with %F{cyan}-h%f for help." >&2
   exit 2
 fi
@@ -98,6 +112,7 @@ typeset -r args=(
   -timezone UTC
   -skip-adb-auth
   -no-metrics
+  "${emulator_extra_args[@]}"
 )
 
 say_args "${args[@]}"

firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/core/DataConnectCache.kt

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2026 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.firebase.dataconnect.core
+
+import com.google.firebase.dataconnect.core.LoggerGlobals.Logger
+import com.google.firebase.dataconnect.core.LoggerGlobals.debug
+import com.google.firebase.dataconnect.sqlite.DataConnectCacheDatabase
+import com.google.firebase.dataconnect.util.ObjectLifecycleManager
+import java.io.File
+import kotlinx.coroutines.CoroutineDispatcher
+
+internal class DataConnectCache(
+  private val dbFile: File?,
+  val maxAge: kotlin.time.Duration,
+  private val cpuDispatcher: CoroutineDispatcher,
+  private val logger: Logger,
+) : ObjectLifecycleManager<DataConnectCacheDatabase>(cpuDispatcher, logger) {
+
+  val maxAgeProto: com.google.protobuf.Duration =
+    maxAge.toComponents { seconds, nanos ->
+      com.google.protobuf.Duration.newBuilder().setSeconds(seconds).setNanos(nanos).build()
+    }
+
+  override fun create() =
+    DataConnectCacheDatabase(
+      dbFile,
+      cpuDispatcher,
+      Logger("DataConnectCacheDatabase").apply { debug { "created by ${logger.nameWithId}" } }
+    )
+
+  override suspend fun initialize(instance: DataConnectCacheDatabase) {
+    instance.initialize()
+  }
+
+  override suspend fun destroy(instance: DataConnectCacheDatabase) {
+    instance.close()
+  }
+
+  override fun toString() = "DataConnectCache(dbFile=$dbFile, maxAge=$maxAge)"
+}