Merge branch 'main' into ep/metalava-semver

Author: emilypgoogle

.github/workflows/dataconnect.yml

@@ -73,27 +73,35 @@ jobs:
           npm install --fund=false --audit=false --save --save-exact firebase-tools@${{ env.FDC_FIREBASE_TOOLS_VERSION }}
 
       - name: Restore Gradle cache
+        id: restore-gradle-cache
         uses: actions/cache/restore@v4
         if: github.event_name != 'schedule'
         with:
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
-          key: gradle-cache-jqnvfzw6w7
+          key: gradle-cache-jqnvfzw6w7-${{ github.run_id }}
+          restore-keys: |
+            gradle-cache-jqnvfzw6w7-
 
       - name: tool versions
         continue-on-error: true
         run: |
-          set +e -v
-          uname -a
-          which java
-          java -version
-          which javac
-          javac -version
-          which node
-          node --version
-          ${{ env.FDC_FIREBASE_COMMAND }} --version
-          ./gradlew --version
+          function run_cmd {
+            echo "==============================================================================="
+            echo "Running Command: $*"
+            ("$@" 2>&1) || echo "WARNING: command failed with non-zero exit code $?: $*"
+          }
+
+          run_cmd uname -a
+          run_cmd which java
+          run_cmd java -version
+          run_cmd which javac
+          run_cmd javac -version
+          run_cmd which node
+          run_cmd node --version
+          run_cmd ${{ env.FDC_FIREBASE_COMMAND }} --version
+          run_cmd ./gradlew --version
 
       - name: Gradle assembleDebugAndroidTest
         run: |
@@ -116,7 +124,7 @@ jobs:
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
-          key: gradle-cache-jqnvfzw6w7
+          key: ${{ steps.restore-gradle-cache.outputs.cache-primary-key }}
 
       - name: Enable KVM group permissions for Android Emulator
         run: |
@@ -128,24 +136,24 @@ jobs:
       - name: Restore AVD cache
         uses: actions/cache/restore@v4
         if: github.event_name != 'schedule'
-        id: avd-cache
+        id: restore-avd-cache
         with:
           path: |
             ~/.android/avd/*
             ~/.android/adb*
-          key: avd-cache-zhdsn586je-api${{ env.FDC_ANDROID_EMULATOR_API_LEVEL }}
-
-      - run: echo "github.event_name == '${{ github.event_name }}' steps.avd-cache.outputs.cache-hit == '${{ steps.avd-cache.outputs.cache-hit }}'"
+          key: avd-cache-zhdsn586je-api${{ env.FDC_ANDROID_EMULATOR_API_LEVEL }}-${{ github.run_id }}
+          restore-keys: |
+            avd-cache-zhdsn586je-api${{ env.FDC_ANDROID_EMULATOR_API_LEVEL }}-
 
       - name: Create AVD
-        if: github.event_name == 'schedule' || steps.avd-cache.outputs.cache-hit != 'true'
+        if: github.event_name == 'schedule' || steps.restore-avd-cache.outputs.cache-hit != 'true'
         uses: reactivecircus/android-emulator-runner@v2
         with:
           api-level: ${{ env.FDC_ANDROID_EMULATOR_API_LEVEL }}
           arch: x86_64
           force-avd-creation: false
           emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-          disable-animations: false
+          disable-animations: true
           script: echo "Generated AVD snapshot for caching."
 
       - name: Save AVD cache
@@ -155,7 +163,7 @@ jobs:
           path: |
             ~/.android/avd/*
             ~/.android/adb*
-          key: avd-cache-zhdsn586je-api${{ env.FDC_ANDROID_EMULATOR_API_LEVEL }}
+          key: ${{ steps.restore-avd-cache.outputs.cache-primary-key }}
 
       - name: Data Connect Emulator
         run: |

.github/workflows/dataconnect_demo_app.yml

@@ -89,15 +89,20 @@ jobs:
       - name: tool versions
         continue-on-error: true
         run: |
-          set +e -v
-          which java
-          java -version
-          which javac
-          javac -version
-          which node
-          node --version
-          ${{ env.FDC_FIREBASE_COMMAND }} --version
-          ./gradlew --version
+          function run_cmd {
+            echo "==============================================================================="
+            echo "Running Command: $*"
+            ("$@" 2>&1) || echo "WARNING: command failed with non-zero exit code $?: $*"
+          }
+
+          run_cmd which java
+          run_cmd java -version
+          run_cmd which javac
+          run_cmd javac -version
+          run_cmd which node
+          run_cmd node --version
+          run_cmd ${{ env.FDC_FIREBASE_COMMAND }} --version
+          run_cmd ./gradlew --version
 
       - name: ./gradlew assemble test
         run: |

.github/workflows/make-bom.yml

@@ -11,7 +11,9 @@ jobs:
         uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
         with:
           python-version: '3.10'
+
       - uses: actions/[email protected]
+
       - name: Set up JDK 17
         uses: actions/[email protected]
         with:
@@ -21,19 +23,25 @@ jobs:
 
       - name: Build
         run: |
-          ./ci/run.sh \
-          --artifact-target-dir=./logs/artifacts \
-          --artifact-patterns=bom.zip \
-          --artifact-patterns=bomReleaseNotes.md \
-          --artifact-patterns=recipeVersionUpdate.txt \
-          gradle \
-          -- \
-          --build-cache \
-          buildBomZip
-
-      - name: Upload generated artifacts
+          ./gradlew buildBomBundleZip
+
+      - name: Upload bom
+        uses: actions/[email protected]
+        with:
+          name: bom
+          path: build/bom/
+          retention-days: 15
+
+      - name: Upload release notes
+        uses: actions/[email protected]
+        with:
+          name: bom_release_notes
+          path: build/bomReleaseNotes.md
+          retention-days: 15
+
+      - name: Upload recipe version update
         uses: actions/[email protected]
         with:
-          name: artifacts
-          path: ./logs/artifacts/
-          retention-days: 5
+          name: recipe_version
+          path: build/recipeVersionUpdate.txt
+          retention-days: 15

firebase-appdistribution/CHANGELOG.md

@@ -1,5 +1,5 @@
 # Unreleased
-
+* [fixed] Added custom tab support for more browsers [#6692]
 
 # 16.0.0-beta14
 * [changed] Internal improvements to testing on Android 14

firebase-appdistribution/src/main/AndroidManifest.xml

@@ -21,6 +21,12 @@
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
+    <queries>
+        <intent>
+            <action android:name="android.support.customtabs.action.CustomTabsService" />
+        </intent>
+    </queries>
+
     <application>
         <service
             android:name="com.google.firebase.components.ComponentDiscoveryService"

firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/TesterSignInManager.java

@@ -21,10 +21,10 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
+import androidx.browser.customtabs.CustomTabsClient;
 import androidx.browser.customtabs.CustomTabsIntent;
 import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.Task;
@@ -36,7 +36,7 @@
 import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
 import com.google.firebase.inject.Provider;
 import com.google.firebase.installations.FirebaseInstallationsApi;
-import java.util.List;
+import java.util.Collections;
 import java.util.concurrent.Executor;
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -212,10 +212,7 @@ private void openSignInFlowInBrowser(String fid, Activity activity) {
   }
 
   private boolean supportsCustomTabs(Context context) {
-    Intent customTabIntent = new Intent("android.support.customtabs.action.CustomTabsService");
-    customTabIntent.setPackage("com.android.chrome");
-    List<ResolveInfo> resolveInfos =
-        context.getPackageManager().queryIntentServices(customTabIntent, 0);
-    return resolveInfos != null && !resolveInfos.isEmpty();
+    String packageName = CustomTabsClient.getPackageName(context, Collections.emptyList());
+    return packageName != null;
   }
 }

firebase-config/src/main/java/com/google/firebase/remoteconfig/FirebaseRemoteConfig.java

@@ -656,16 +656,17 @@ private Task<Void> setDefaultsWithStringsMapAsync(Map<String, String> defaultsSt
    * Asynchronously changes the custom signals for this {@link FirebaseRemoteConfig} instance.
    *
    * <p>Custom signals are subject to limits on the size of key/value pairs and the total
-   * number of signals. Any calls that exceed these limits will be discarded.
+   * number of signals. Any calls that exceed these limits will be discarded. See <a
+   * href="https://firebase.google.com/docs/remote-config/parameters?template_type=client#custom-signal-limits">Custom
+   * Signal Limits</a>.
    *
    * @param customSignals The custom signals to set for this instance.
-   * <ol>
+   * <ul>
    *   <li>New keys will add new key-value pairs in the custom signals.
    *   <li>Existing keys with new values will update the corresponding signals.
    *   <li>Setting a key's value to {@code null} will remove the associated signal.
-   * </ol>
+   * </ul>
    */
-  // TODO(b/385028620): Add link to documentation about custom signal limits.
   @NonNull
   public Task<Void> setCustomSignals(@NonNull CustomSignals customSignals) {
     return Tasks.call(

firebase-crashlytics-ndk/CHANGELOG.md

@@ -1,5 +1,5 @@
 # Unreleased
-
+* [changed] Updated `firebase-crashlytics` dependency to v19.4.1
 
 # 19.3.0
 * [changed] Updated `firebase-crashlytics` dependency to v19.3.0

firebase-crashlytics/CHANGELOG.md

@@ -1,5 +1,5 @@
 # Unreleased
-
+* [changed] Updated `firebase-sessions` dependency to v2.0.9
 
 # 19.4.0
 * [feature] Added an overload for `recordException` that allows logging additional custom

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/KeyValueBuilder.kt

@@ -23,7 +23,7 @@ private constructor(
   private val builder: CustomKeysAndValues.Builder,
 ) {
   @Deprecated(
-    "Do not construct this directly. Use `setCustomKeys` instead. To be removed in the next major release."
+    "Do not construct this directly. Use [setCustomKeys] instead. To be removed in the next major release."
   )
   constructor(crashlytics: FirebaseCrashlytics) : this(crashlytics, CustomKeysAndValues.Builder())