Merge branch 'main' into rl.deps.2

Author: rlazo

firebase-ai/src/main/kotlin/com/google/firebase/ai/FirebaseAI.kt

@@ -51,7 +51,8 @@ internal constructor(
   /**
    * Instantiates a new [GenerativeModel] given the provided parameters.
    *
-   * @param modelName The name of the model to use, for example `"gemini-2.0-flash-exp"`.
+   * @param modelName The name of the model to use. See the documentation for a list of
+   * [supported models](https://firebase.google.com/docs/ai-logic/models).
    * @param generationConfig The configuration parameters to use for content generation.
    * @param safetySettings The safety bounds the model will abide to during content generation.
    * @param tools A list of [Tool]s the model may use to generate content.
@@ -106,7 +107,8 @@ internal constructor(
   /**
    * Instantiates a new [LiveGenerationConfig] given the provided parameters.
    *
-   * @param modelName The name of the model to use, for example `"gemini-2.0-flash-exp"`.
+   * @param modelName The name of the model to use. See the documentation for a list of
+   * [supported models](https://firebase.google.com/docs/ai-logic/models).
    * @param generationConfig The configuration parameters to use for content generation.
    * @param tools A list of [Tool]s the model may use to generate content.
    * @param systemInstruction [Content] instructions that direct the model to behave a certain way.
@@ -157,7 +159,8 @@ internal constructor(
   /**
    * Instantiates a new [ImagenModel] given the provided parameters.
    *
-   * @param modelName The name of the model to use, for example `"imagen-3.0-generate-001"`.
+   * @param modelName The name of the model to use. See the documentation for a list of
+   * [supported models](https://firebase.google.com/docs/ai-logic/models).
    * @param generationConfig The configuration parameters to use for image generation.
    * @param safetySettings The safety bounds the model will abide by during image generation.
    * @param requestOptions Configuration options for sending requests to the backend.

firebase-ai/src/main/kotlin/com/google/firebase/ai/ImagenModel.kt

@@ -41,6 +41,9 @@ import com.google.firebase.auth.internal.InternalAuthProvider
 /**
  * Represents a generative model (like Imagen), capable of generating images based on various input
  * types.
+ *
+ * See the documentation for a list of
+ * [supported models](https://firebase.google.com/docs/ai-logic/models).
  */
 @PublicPreviewAPI
 public class ImagenModel

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

@@ -76,8 +76,8 @@ internal constructor(
  *
  * @property category The category of harm being assessed (e.g., Hate speech).
  * @property probability The likelihood of the content causing harm.
- * @property probabilityScore A numerical score representing the probability of harm, between 0 and
- * 1.
+ * @property probabilityScore A numerical score representing the probability of harm, between `0`
+ * and `1`.
  * @property blocked Indicates whether the content was blocked due to safety concerns.
  * @property severity The severity of the potential harm.
  * @property severityScore A numerical score representing the severity of harm.

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

@@ -22,14 +22,13 @@ import kotlinx.serialization.Serializable
  * The model's response to a count tokens request.
  *
  * **Important:** The counters in this class do not include billable image, video or other non-text
- * input. See [Vertex AI pricing](https://cloud.google.com/vertex-ai/generative-ai/pricing) for
- * details.
+ * input. See [Pricing](https://firebase.google.com/docs/ai-logic/pricing) for details.
  *
  * @property totalTokens The total number of tokens in the input given to the model as a prompt.
  * @property totalBillableCharacters The total number of billable characters in the text input given
  * to the model as a prompt. **Important:** this property does not include billable image, video or
- * other non-text input. See
- * [Vertex AI pricing](https://cloud.google.com/vertex-ai/generative-ai/pricing) for details.
+ * other non-text input. See [Pricing](https://firebase.google.com/docs/ai-logic/pricing) for
+ * details.
  * @property promptTokensDetails The breakdown, by modality, of how many tokens are consumed by the
  * prompt.
  */

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

@@ -132,7 +132,7 @@ internal constructor(
  *
  * @param inlineData the binary data as a [ByteArray]
  * @param mimeType an IANA standard MIME type. For supported values, see the
- * [Vertex AI documentation](https://cloud.google.com/vertex-ai/generative-ai/docs/multimodal/send-multimodal-prompts#media_requirements)
+ * [Firebase documentation](https://firebase.google.com/docs/vertex-ai/input-file-requirements).
  */
 public class InlineDataPart
 internal constructor(

firebase-common/src/main/java/com/google/firebase/datastorage/JavaDataStorage.kt

@@ -17,11 +17,15 @@
 package com.google.firebase.datastorage
 
 import android.content.Context
+import android.os.Process
+import android.util.Log
 import androidx.datastore.core.DataStore
+import androidx.datastore.core.handlers.ReplaceFileCorruptionHandler
 import androidx.datastore.preferences.SharedPreferencesMigration
 import androidx.datastore.preferences.core.MutablePreferences
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.emptyPreferences
 import androidx.datastore.preferences.preferencesDataStore
 import com.google.firebase.annotations.concurrent.Background
 import kotlinx.coroutines.flow.firstOrNull
@@ -60,7 +64,16 @@ class JavaDataStorage(val context: Context, val name: String) {
   private val Context.dataStore: DataStore<Preferences> by
     preferencesDataStore(
       name = name,
-      produceMigrations = { listOf(SharedPreferencesMigration(it, name)) }
+      produceMigrations = { listOf(SharedPreferencesMigration(it, name)) },
+      corruptionHandler =
+        ReplaceFileCorruptionHandler { ex ->
+          Log.w(
+            JavaDataStorage::class.simpleName,
+            "CorruptionException in ${name} DataStore running in process ${Process.myPid()}",
+            ex
+          )
+          emptyPreferences()
+        }
     )
 
   private val dataStore = context.dataStore

firebase-crashlytics-ndk/CHANGELOG.md

@@ -1,5 +1,5 @@
 # Unreleased
-
+* [changed] Updated `firebase-crashlytics` dependency to 20.0.1
 
 # 20.0.0
 * [changed] **Breaking Change**: Updated minSdkVersion to API level 23 or higher.
@@ -243,12 +243,12 @@ change. The following release notes describe changes in the new SDK.
     <li>If you're using [crashlytics] for NDK crash reporting in your app for
       the first time, follow the
       <a href="/docs/crashlytics/get-started-new-sdk?platform=android">getting
-        started instructions</a>.
+	started instructions</a>.
     </li>
     <li>If you're upgrading from the legacy Fabric SDK to the
       [firebase_crashlytics] SDK for NDK crash reporting, follow the
       <a href="/docs/crashlytics/upgrade-sdk?platform=android">upgrade
-        instructions</a> to update your app with the following SDK changes.
+	instructions</a> to update your app with the following SDK changes.
     </li>
   </ul>
 </aside>
@@ -259,4 +259,3 @@ change. The following release notes describe changes in the new SDK.
  uploading symbol files to [crashlytics] servers. See the
  [[crashlytics] Gradle plugin documentation](/docs/crashlytics/ndk-reports-new-sdk)
  for more information.
-

firebase-crashlytics/CHANGELOG.md

@@ -1,5 +1,5 @@
 # Unreleased
-
+** [changed] Updated `firebase-sessions` dependency to v3.0.1
 
 # 20.0.0
 * [changed] **Breaking Change**: Removed deprecated public constructor `KeyValueBuilder(crashlytics: FirebaseCrashlytics)`
@@ -683,12 +683,12 @@ The following release notes describe changes in the new SDK.
     <li>If you're using [crashlytics] for NDK crash reporting in your app for
       the first time, follow the
       <a href="/docs/crashlytics/get-started-new-sdk?platform=android">getting
-        started instructions</a>.
+	started instructions</a>.
     </li>
     <li>If you're upgrading from the legacy Fabric SDK to the
       [firebase_crashlytics] SDK, follow the
       <a href="/docs/crashlytics/upgrade-sdk?platform=android">upgrade
-        instructions</a> to update your app with the following SDK changes.
+	instructions</a> to update your app with the following SDK changes.
     </li>
   </ul>
 </aside>
@@ -702,4 +702,3 @@ The following release notes describe changes in the new SDK.
   from your `AndroidManifest.xml` file.
 * [removed] The `fabric.properties` and `crashlytics.properties` files are no
   longer supported. Remove them from your app.
-

firebase-perf/CHANGELOG.md

@@ -1,6 +1,5 @@
 # Unreleased
 * [fixed] Fixed an ANR on app launch. [#4831]
-* [fixed] Fixed app start traces on API 34+. [#5920]
 
 # 22.0.0
 * [changed] **Breaking Change**: Updated minSdkVersion to API level 23 or higher.

firebase-perf/src/main/java/com/google/firebase/perf/metrics/AppStartTrace.java

@@ -75,8 +75,6 @@ public class AppStartTrace implements ActivityLifecycleCallbacks, LifecycleObser
   private static final @NonNull Timer PERF_CLASS_LOAD_TIME = new Clock().getTime();
   private static final long MAX_LATENCY_BEFORE_UI_INIT = TimeUnit.MINUTES.toMicros(1);
 
-  private static final long MAX_BACKGROUND_RUNNABLE_DELAY = TimeUnit.MILLISECONDS.toMicros(100);
-
   // Core pool size 0 allows threads to shut down if they're idle
   private static final int CORE_POOL_SIZE = 0;
   private static final int MAX_POOL_SIZE = 1; // Only need single thread
@@ -113,8 +111,6 @@ public class AppStartTrace implements ActivityLifecycleCallbacks, LifecycleObser
   private final @Nullable Timer processStartTime;
   private final @Nullable Timer firebaseClassLoadTime;
   private Timer onCreateTime = null;
-
-  private Timer mainThreadRunnableTime = null;
   private Timer onStartTime = null;
   private Timer onResumeTime = null;
   private Timer firstForegroundTime = null;
@@ -323,26 +319,8 @@ private void recordOnDrawFrontOfQueue() {
     logExperimentTrace(this.experimentTtid);
   }
 
-  private void resolveIsStartedFromBackground() {
-    // If the mainThreadRunnableTime is null, either the runnable hasn't run, or this check has
-    // already been made.
-    if (mainThreadRunnableTime == null) {
-      return;
-    }
-
-    // Set it to true if the runnable ran more than 100ms prior to onActivityCreated()
-    if (mainThreadRunnableTime.getDurationMicros() > MAX_BACKGROUND_RUNNABLE_DELAY) {
-      isStartedFromBackground = true;
-    }
-
-    // Set this to null to prevent additional checks if `onActivityCreated()` is called again.
-    mainThreadRunnableTime = null;
-  }
-
   @Override
   public synchronized void onActivityCreated(Activity activity, Bundle savedInstanceState) {
-    resolveIsStartedFromBackground();
-
     if (isStartedFromBackground || onCreateTime != null // An activity already called onCreate()
     ) {
       return;
@@ -582,7 +560,8 @@ public static boolean isScreenOn(Context appContext) {
    * We use StartFromBackgroundRunnable to detect if app is started from background or foreground.
    * If app is started from background, we do not generate AppStart trace. This runnable is posted
    * to main UI thread from FirebasePerfEarly. If app is started from background, this runnable will
-   * be executed earlier than 100ms of any activity's onCreate() method.
+   * be executed before any activity's onCreate() method. If app is started from foreground,
+   * activity's onCreate() method is executed before this runnable.
    */
   public static class StartFromBackgroundRunnable implements Runnable {
     private final AppStartTrace trace;
@@ -593,7 +572,10 @@ public StartFromBackgroundRunnable(final AppStartTrace trace) {
 
     @Override
     public void run() {
-      trace.mainThreadRunnableTime = new Timer();
+      // if no activity has ever been created.
+      if (trace.onCreateTime == null) {
+        trace.isStartedFromBackground = true;
+      }
     }
   }
 
@@ -632,7 +614,7 @@ Timer getOnResumeTime() {
   }
 
   @VisibleForTesting
-  void setMainThreadRunnableTime(Timer timer) {
-    mainThreadRunnableTime = timer;
+  void setIsStartFromBackground() {
+    isStartedFromBackground = true;
   }
 }