Merge branch 'main' into strictmode_diskread_violation

OOS93 · web-flow · commit f402566e4cac · 2025-10-31T11:57:30.000-06:00
diff --git a/firebase-ai/CHANGELOG.md b/firebase-ai/CHANGELOG.md
@@ -1,9 +1,13 @@
 # Unreleased
 
+# 17.5.0
+
 - [changed] Added better scheduling and louder output for Live API.
 - [changed] Added support for input and output transcription. (#7482)
 - [feature] Added support for sending realtime audio and video in a `LiveSession`.
 - [changed] Removed redundant internal exception types. (#7475)
+- [feature] Added support for server templates via `TemplateGenerativeModel` and 
+  `TemplateImagenModel`. (#7503)
 
 # 17.4.0
 
diff --git a/firebase-ai/gradle.properties b/firebase-ai/gradle.properties
@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=17.5.0
-latestReleasedVersion=17.4.0
+version=17.5.1
+latestReleasedVersion=17.5.0
diff --git a/firebase-dataconnect/CHANGELOG.md b/firebase-dataconnect/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Unreleased
 
+# 17.1.1
+
 - [changed] Internal refactor for managing Auth and App Check tokens
   ([#7484](https://github.com/firebase/firebase-android-sdk/pull/7484),
   [#7485](https://github.com/firebase/firebase-android-sdk/pull/7485))
diff --git a/firebase-dataconnect/gradle.properties b/firebase-dataconnect/gradle.properties
@@ -1,2 +1,2 @@
-version=17.1.1
-latestReleasedVersion=17.1.0
+version=17.1.2
+latestReleasedVersion=17.1.1
diff --git a/firebase-functions/CHANGELOG.md b/firebase-functions/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Unreleased
 
+# 22.1.0
+
 - [changed] Bumped dependency on OkHTTP to version 4.12.0 from version 3.12.13. If your app depends
   on OkHTTP version 3.x the change is both binary- and Java source-compatible, with a few small
   exceptions. See https://square.github.io/okhttp/changelogs/upgrading_to_okhttp_4/ for more
diff --git a/firebase-functions/gradle.properties b/firebase-functions/gradle.properties
@@ -1,3 +1,3 @@
-version=22.1.0
-latestReleasedVersion=22.0.1
+version=22.1.1
+latestReleasedVersion=22.1.0
 android.enableUnitTestBinaryResources=true
diff --git a/firebase-inappmessaging-display/CHANGELOG.md b/firebase-inappmessaging-display/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Unreleased
 
+# 22.0.2
+
 - [changed] Updated `com.github.bumptech.glide:glide` dependency to `5.0.5`. [#7469]
 
 # 22.0.1
diff --git a/firebase-inappmessaging-display/gradle.properties b/firebase-inappmessaging-display/gradle.properties
@@ -1,2 +1,2 @@
-version=22.0.2
-latestReleasedVersion=22.0.1
+version=22.0.3
+latestReleasedVersion=22.0.2
diff --git a/firebase-inappmessaging/CHANGELOG.md b/firebase-inappmessaging/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Unreleased
 
+# 22.0.2
+
 - [changed] Bumped internal dependencies.
 
 # 22.0.1
diff --git a/firebase-inappmessaging/gradle.properties b/firebase-inappmessaging/gradle.properties
@@ -1,2 +1,2 @@
-version=22.0.2
-latestReleasedVersion=22.0.1
+version=22.0.3
+latestReleasedVersion=22.0.2
diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/RemoteMessage.java b/firebase-messaging/src/main/java/com/google/firebase/messaging/RemoteMessage.java
@@ -35,6 +35,7 @@
 import com.google.firebase.messaging.Constants.MessagePayloadKeys;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -131,7 +132,7 @@ public Map<String, String> getData() {
     if (data == null) {
       data = MessagePayloadKeys.extractDeveloperDefinedPayload(bundle);
     }
-    return data;
+    return new HashMap<>(data);
   }
 
   /** @hide */
diff --git a/firebase-perf/CHANGELOG.md b/firebase-perf/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Unreleased
 
+# 22.0.3
+
 - [changed] Bumped dependency on OkHTTP to version 4.12.0 from version 3.12.13. If your app depends
   on OkHTTP version 3.x the change is both binary- and Java source-compatible, with a few small
   exceptions. See https://square.github.io/okhttp/changelogs/upgrading_to_okhttp_4/ for more
diff --git a/firebase-perf/gradle.properties b/firebase-perf/gradle.properties
@@ -15,7 +15,7 @@
 #
 #
 
-version=22.0.3
-latestReleasedVersion=22.0.2
+version=22.0.4
+latestReleasedVersion=22.0.3
 android.enableUnitTestBinaryResources=true
 
diff --git a/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SharedSessionRepository.kt b/firebase-sessions/src/main/kotlin/com/google/firebase/sessions/SharedSessionRepository.kt
@@ -64,6 +64,8 @@ constructor(
   override var isInForeground = false
     private set
 
+  private var pendingForegroundCheck = false
+
   /**
    * Either notify the subscribers with general multi-process supported session or fallback local
    * session
@@ -93,6 +95,10 @@ constructor(
         }
         .collect { sessionData ->
           localSessionData = sessionData
+          if (pendingForegroundCheck) {
+            pendingForegroundCheck = false
+            appForeground()
+          }
           val sessionId = sessionData.sessionDetails.sessionId
           notifySubscribers(sessionId, NotificationType.GENERAL)
         }
@@ -122,6 +128,7 @@ constructor(
   override fun appForeground() {
     isInForeground = true
     if (!::localSessionData.isInitialized) {
+      pendingForegroundCheck = true
       Log.d(TAG, "App foregrounded, but local SessionData not initialized")
       return
     }
