From e2bf89f6094ab4e0e398562d1ebf3c4899ed43b3 Mon Sep 17 00:00:00 2001
From: Jon Simantov <jsimantov@google.com>
Date: Tue, 16 Apr 2024 14:34:16 -0700
Subject: [PATCH 1/3] Update SDK versions for I/O release.

---
 analytics/build.gradle                                  | 6 +++---
 analytics/integration_test/LibraryManifest.xml          | 2 +-
 analytics/integration_test/build.gradle                 | 6 +++---
 app/app_resources/build.gradle                          | 2 +-
 app/build.gradle                                        | 6 +++---
 app/google_api_resources/build.gradle                   | 2 +-
 app/integration_test/LibraryManifest.xml                | 2 +-
 app/integration_test/build.gradle                       | 6 +++---
 app/invites_resources/build.gradle                      | 2 +-
 app/test_resources/build.gradle                         | 2 +-
 app_check/app_check_resources/build.gradle              | 2 +-
 app_check/build.gradle                                  | 6 +++---
 app_check/integration_test/LibraryManifest.xml          | 2 +-
 app_check/integration_test/build.gradle                 | 6 +++---
 auth/auth_resources/build.gradle                        | 2 +-
 auth/build.gradle                                       | 6 +++---
 auth/integration_test/LibraryManifest.xml               | 2 +-
 auth/integration_test/build.gradle                      | 6 +++---
 database/build.gradle                                   | 6 +++---
 database/database_resources/build.gradle                | 2 +-
 database/integration_test/LibraryManifest.xml           | 2 +-
 database/integration_test/build.gradle                  | 6 +++---
 dynamic_links/build.gradle                              | 6 +++---
 dynamic_links/integration_test/LibraryManifest.xml      | 2 +-
 dynamic_links/integration_test/build.gradle             | 6 +++---
 firestore/build.gradle                                  | 6 +++---
 firestore/firestore_resources/AndroidManifest.xml       | 2 +-
 firestore/firestore_resources/build.gradle              | 2 +-
 firestore/integration_test/LibraryManifest.xml          | 2 +-
 firestore/integration_test/build.gradle                 | 6 +++---
 firestore/integration_test_internal/LibraryManifest.xml | 2 +-
 firestore/integration_test_internal/build.gradle        | 6 +++---
 functions/build.gradle                                  | 6 +++---
 functions/integration_test/LibraryManifest.xml          | 2 +-
 functions/integration_test/build.gradle                 | 6 +++---
 gma/build.gradle                                        | 6 +++---
 gma/gma_resources/AndroidManifest.xml                   | 2 +-
 gma/gma_resources/build.gradle                          | 2 +-
 gma/integration_test/LibraryManifest.xml                | 2 +-
 gma/integration_test/build.gradle                       | 4 ++--
 installations/build.gradle                              | 6 +++---
 installations/integration_test/LibraryManifest.xml      | 2 +-
 installations/integration_test/build.gradle             | 6 +++---
 messaging/AndroidManifest.xml                           | 2 +-
 messaging/build.gradle                                  | 6 +++---
 messaging/integration_test/LibraryManifest.xml          | 2 +-
 messaging/integration_test/build.gradle                 | 6 +++---
 messaging/messaging_java/build.gradle                   | 4 ++--
 messaging/src/android/java/LibraryManifest.xml          | 2 +-
 release_build_files/readme.md                           | 5 +++++
 remote_config/build.gradle                              | 6 +++---
 remote_config/integration_test/LibraryManifest.xml      | 2 +-
 remote_config/integration_test/build.gradle             | 6 +++---
 remote_config/remote_config_resources/build.gradle      | 2 +-
 scripts/gha/ui_testing/uitest_android/app/build.gradle  | 6 +++---
 storage/build.gradle                                    | 6 +++---
 storage/integration_test/LibraryManifest.xml            | 2 +-
 storage/integration_test/build.gradle                   | 6 +++---
 storage/storage_resources/build.gradle                  | 2 +-
 testing/build.gradle                                    | 6 +++---
 60 files changed, 122 insertions(+), 117 deletions(-)

diff --git a/analytics/build.gradle b/analytics/build.gradle
index 2b6bf6fb2a..38ff9f13dd 100644
--- a/analytics/build.gradle
+++ b/analytics/build.gradle
@@ -31,7 +31,7 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 33
+  compileSdkVersion 34
   ndkPath System.getenv('ANDROID_NDK_HOME')
   buildToolsVersion '30.0.2'
 
@@ -48,8 +48,8 @@ android {
   }
 
   defaultConfig {
-    minSdkVersion 19
-    targetSdkVersion 28
+    minSdkVersion 21
+    targetSdkVersion 34
     versionCode 1
     versionName "1.0"
 
diff --git a/analytics/integration_test/LibraryManifest.xml b/analytics/integration_test/LibraryManifest.xml
index d100168a14..973812b72d 100644
--- a/analytics/integration_test/LibraryManifest.xml
+++ b/analytics/integration_test/LibraryManifest.xml
@@ -18,6 +18,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.analytics.testapp.lib" >
 
-    <uses-sdk android:minSdkVersion='16'/>
+    <uses-sdk android:minSdkVersion='21'/>
     <application />
 </manifest>
diff --git a/analytics/integration_test/build.gradle b/analytics/integration_test/build.gradle
index cfaf518fd7..6c1847d7ff 100644
--- a/analytics/integration_test/build.gradle
+++ b/analytics/integration_test/build.gradle
@@ -40,7 +40,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 33
+  compileSdkVersion 34
   ndkPath System.getenv('ANDROID_NDK_HOME')
   buildToolsVersion '30.0.2'
 
@@ -55,8 +55,8 @@ android {
 
   defaultConfig {
     applicationId 'com.google.android.analytics.testapp'
-    minSdkVersion 19
-    targetSdkVersion 28
+    minSdkVersion 21
+    targetSdkVersion 34
     versionCode 1
     versionName '1.0'
     externalNativeBuild.cmake {
diff --git a/app/app_resources/build.gradle b/app/app_resources/build.gradle
index 319493739d..4a3326640f 100644
--- a/app/app_resources/build.gradle
+++ b/app/app_resources/build.gradle
@@ -36,7 +36,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 33
+  compileSdkVersion 34
 
   sourceSets {
     main {
diff --git a/app/build.gradle b/app/build.gradle
index 59e5e1c137..da52386f5c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,7 +31,7 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 33
+  compileSdkVersion 34
   ndkPath System.getenv('ANDROID_NDK_HOME')
   buildToolsVersion '30.0.2'
 
@@ -48,8 +48,8 @@ android {
   }
 
   defaultConfig {
-    minSdkVersion 19
-    targetSdkVersion 28
+    minSdkVersion 21
+    targetSdkVersion 34
     versionCode 1
     versionName "1.0"
 
diff --git a/app/google_api_resources/build.gradle b/app/google_api_resources/build.gradle
index 9ab0b870b5..7838c935ed 100644
--- a/app/google_api_resources/build.gradle
+++ b/app/google_api_resources/build.gradle
@@ -36,7 +36,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 33
+  compileSdkVersion 34
 
   sourceSets {
     main {
diff --git a/app/integration_test/LibraryManifest.xml b/app/integration_test/LibraryManifest.xml
index a3de7a677f..973812b72d 100644
--- a/app/integration_test/LibraryManifest.xml
+++ b/app/integration_test/LibraryManifest.xml
@@ -18,6 +18,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.analytics.testapp.lib" >
 
-    <uses-sdk android:minSdkVersion='14'/>
+    <uses-sdk android:minSdkVersion='21'/>
     <application />
 </manifest>
diff --git a/app/integration_test/build.gradle b/app/integration_test/build.gradle
index 6ba58fc179..22134d5e79 100644
--- a/app/integration_test/build.gradle
+++ b/app/integration_test/build.gradle
@@ -40,7 +40,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 33
+  compileSdkVersion 34
   ndkPath System.getenv('ANDROID_NDK_HOME')
   buildToolsVersion '30.0.2'
 
@@ -55,8 +55,8 @@ android {
 
   defaultConfig {
     applicationId 'com.google.android.analytics.testapp'
-    minSdkVersion 19
-    targetSdkVersion 28
+    minSdkVersion 21
+    targetSdkVersion 34
     versionCode 1
     versionName '1.0'
     externalNativeBuild.cmake {
diff --git a/app/invites_resources/build.gradle b/app/invites_resources/build.gradle
index 0ce2ec5a0f..c3d41f10f0 100644
--- a/app/invites_resources/build.gradle
+++ b/app/invites_resources/build.gradle
@@ -36,7 +36,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 33
+  compileSdkVersion 34
 
   sourceSets {
     main {
diff --git a/app/test_resources/build.gradle b/app/test_resources/build.gradle
index a16efe05b3..53c2d0e136 100644
--- a/app/test_resources/build.gradle
+++ b/app/test_resources/build.gradle
@@ -32,7 +32,7 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 33
+  compileSdkVersion 34
 
   sourceSets {
     main {
diff --git a/app_check/app_check_resources/build.gradle b/app_check/app_check_resources/build.gradle
index 9c121f5732..7b9e0eaa0c 100644
--- a/app_check/app_check_resources/build.gradle
+++ b/app_check/app_check_resources/build.gradle
@@ -36,7 +36,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 33
+  compileSdkVersion 34
 
   sourceSets {
     main {
diff --git a/app_check/build.gradle b/app_check/build.gradle
index e4c3e17f1f..cbb730793b 100644
--- a/app_check/build.gradle
+++ b/app_check/build.gradle
@@ -31,7 +31,7 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 33
+  compileSdkVersion 34
   ndkPath System.getenv('ANDROID_NDK_HOME')
   buildToolsVersion '30.0.2'
 
@@ -48,8 +48,8 @@ android {
   }
 
   defaultConfig {
-    minSdkVersion 19
-    targetSdkVersion 28
+    minSdkVersion 21
+    targetSdkVersion 34
     versionCode 1
     versionName "1.0"
 
diff --git a/app_check/integration_test/LibraryManifest.xml b/app_check/integration_test/LibraryManifest.xml
index d6e23c7191..6ecccb073e 100644
--- a/app_check/integration_test/LibraryManifest.xml
+++ b/app_check/integration_test/LibraryManifest.xml
@@ -18,6 +18,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.firebase.cpp.appcheck.testapp.lib" >
 
-    <uses-sdk android:minSdkVersion='14'/>
+    <uses-sdk android:minSdkVersion='21'/>
     <application />
 </manifest>
diff --git a/app_check/integration_test/build.gradle b/app_check/integration_test/build.gradle
index 98e49fd9c4..93afc7d262 100644
--- a/app_check/integration_test/build.gradle
+++ b/app_check/integration_test/build.gradle
@@ -40,7 +40,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 33
+  compileSdkVersion 34
   ndkPath System.getenv('ANDROID_NDK_HOME')
   buildToolsVersion '30.0.2'
 
@@ -55,8 +55,8 @@ android {
 
   defaultConfig {
     applicationId 'com.google.firebase.cpp.appcheck.testapp'
-    minSdkVersion 19
-    targetSdkVersion 28
+    minSdkVersion 21
+    targetSdkVersion 34
     versionCode 1
     versionName '1.0'
     externalNativeBuild.cmake {
diff --git a/auth/auth_resources/build.gradle b/auth/auth_resources/build.gradle
index 2598f3b964..2d3efdee5a 100644
--- a/auth/auth_resources/build.gradle
+++ b/auth/auth_resources/build.gradle
@@ -36,7 +36,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 33
+  compileSdkVersion 34
 
   sourceSets {
     main {
diff --git a/auth/build.gradle b/auth/build.gradle
index b47f614610..3d4c6cd9f7 100644
--- a/auth/build.gradle
+++ b/auth/build.gradle
@@ -31,7 +31,7 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 33
+  compileSdkVersion 34
   ndkPath System.getenv('ANDROID_NDK_HOME')
   buildToolsVersion '30.0.2'
 
@@ -48,8 +48,8 @@ android {
   }
 
   defaultConfig {
-    minSdkVersion 19
-    targetSdkVersion 28
+    minSdkVersion 21
+    targetSdkVersion 34
     versionCode 1
     versionName "1.0"
 
diff --git a/auth/integration_test/LibraryManifest.xml b/auth/integration_test/LibraryManifest.xml
index 15ba5dcf21..fce82eebc7 100644
--- a/auth/integration_test/LibraryManifest.xml
+++ b/auth/integration_test/LibraryManifest.xml
@@ -18,6 +18,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.auth.testapp.lib" >
 
-    <uses-sdk android:minSdkVersion='16'/>
+    <uses-sdk android:minSdkVersion='21'/>
     <application />
 </manifest>
diff --git a/auth/integration_test/build.gradle b/auth/integration_test/build.gradle
index e52a9ffb1a..4477dca74b 100644
--- a/auth/integration_test/build.gradle
+++ b/auth/integration_test/build.gradle
@@ -40,7 +40,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 33
+  compileSdkVersion 34
   ndkPath System.getenv('ANDROID_NDK_HOME')
   buildToolsVersion '30.0.2'
 
@@ -55,8 +55,8 @@ android {
 
   defaultConfig {
     applicationId 'com.google.android.auth.testapp'
-    minSdkVersion 19
-    targetSdkVersion 28
+    minSdkVersion 21
+    targetSdkVersion 34
     versionCode 1
     versionName '1.0'
     externalNativeBuild.cmake {
diff --git a/database/build.gradle b/database/build.gradle
index cc990d3bba..4c271b1c0d 100644
--- a/database/build.gradle
+++ b/database/build.gradle
@@ -31,7 +31,7 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 33
+  compileSdkVersion 34
   ndkPath System.getenv('ANDROID_NDK_HOME')
   buildToolsVersion '30.0.2'
 
@@ -48,8 +48,8 @@ android {
   }
 
   defaultConfig {
-    minSdkVersion 19
-    targetSdkVersion 28
+    minSdkVersion 21
+    targetSdkVersion 34
     versionCode 1
     versionName "1.0"
 
diff --git a/database/database_resources/build.gradle b/database/database_resources/build.gradle
index a3634b110d..cb8f9a3f2c 100644
--- a/database/database_resources/build.gradle
+++ b/database/database_resources/build.gradle
@@ -32,7 +32,7 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 33
+  compileSdkVersion 34
 
   sourceSets {
     main {
diff --git a/database/integration_test/LibraryManifest.xml b/database/integration_test/LibraryManifest.xml
index f456eff383..901fcd4cf1 100644
--- a/database/integration_test/LibraryManifest.xml
+++ b/database/integration_test/LibraryManifest.xml
@@ -18,6 +18,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.firebase.cpp.database.testapp.lib" >
 
-    <uses-sdk android:minSdkVersion='14'/>
+    <uses-sdk android:minSdkVersion='21'/>
     <application />
 </manifest>
diff --git a/database/integration_test/build.gradle b/database/integration_test/build.gradle
index c4a838aec9..29e2ffd6c4 100644
--- a/database/integration_test/build.gradle
+++ b/database/integration_test/build.gradle
@@ -40,7 +40,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 33
+  compileSdkVersion 34
   ndkPath System.getenv('ANDROID_NDK_HOME')
   buildToolsVersion '30.0.2'
 
@@ -55,8 +55,8 @@ android {
 
   defaultConfig {
     applicationId 'com.google.firebase.cpp.database.testapp'
-    minSdkVersion 19
-    targetSdkVersion 28
+    minSdkVersion 21
+    targetSdkVersion 34
     versionCode 1
     versionName '1.0'
     externalNativeBuild.cmake {
diff --git a/dynamic_links/build.gradle b/dynamic_links/build.gradle
index e244825c73..9dbfd78e32 100644
--- a/dynamic_links/build.gradle
+++ b/dynamic_links/build.gradle
@@ -31,7 +31,7 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 33
+  compileSdkVersion 34
   ndkPath System.getenv('ANDROID_NDK_HOME')
   buildToolsVersion '30.0.2'
 
@@ -48,8 +48,8 @@ android {
   }
 
   defaultConfig {
-    minSdkVersion 19
-    targetSdkVersion 28
+    minSdkVersion 21
+    targetSdkVersion 34
     versionCode 1
     versionName "1.0"
 
diff --git a/dynamic_links/integration_test/LibraryManifest.xml b/dynamic_links/integration_test/LibraryManifest.xml
index ae1fb94a3d..e448029413 100644
--- a/dynamic_links/integration_test/LibraryManifest.xml
+++ b/dynamic_links/integration_test/LibraryManifest.xml
@@ -18,6 +18,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.dynamiclinks.testapp.lib" >
 
-    <uses-sdk android:minSdkVersion='14'/>
+    <uses-sdk android:minSdkVersion='21'/>
     <application />
 </manifest>
diff --git a/dynamic_links/integration_test/build.gradle b/dynamic_links/integration_test/build.gradle
index 85157e99f5..cf1575c4dd 100644
--- a/dynamic_links/integration_test/build.gradle
+++ b/dynamic_links/integration_test/build.gradle
@@ -40,7 +40,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 33
+  compileSdkVersion 34
   ndkPath System.getenv('ANDROID_NDK_HOME')
   buildToolsVersion '30.0.2'
 
@@ -55,8 +55,8 @@ android {
 
   defaultConfig {
     applicationId 'com.google.android.dynamiclinks.testapp'
-    minSdkVersion 19
-    targetSdkVersion 28
+    minSdkVersion 21
+    targetSdkVersion 34
     versionCode 1
     versionName '1.0'
     externalNativeBuild.cmake {
diff --git a/firestore/build.gradle b/firestore/build.gradle
index 5cae4bacf6..580629457d 100644
--- a/firestore/build.gradle
+++ b/firestore/build.gradle
@@ -31,7 +31,7 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 33
+  compileSdkVersion 34
   ndkPath System.getenv('ANDROID_NDK_HOME')
   buildToolsVersion '30.0.2'
 
@@ -49,8 +49,8 @@ android {
 
   defaultConfig {
     // Jelly Bean is the minimum supported version needed by Firebase.
-    minSdkVersion 19
-    targetSdkVersion 28
+    minSdkVersion 21
+    targetSdkVersion 34
     versionCode 1
     versionName "1.0"
 
diff --git a/firestore/firestore_resources/AndroidManifest.xml b/firestore/firestore_resources/AndroidManifest.xml
index 02feeb8dfa..a1b79a2860 100644
--- a/firestore/firestore_resources/AndroidManifest.xml
+++ b/firestore/firestore_resources/AndroidManifest.xml
@@ -2,5 +2,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.FirebaseCppSdkBuild">
   <uses-permission android:name="android.permission.INTERNET"/>
-  <uses-sdk android:minSdkVersion="3"/>
+  <uses-sdk android:minSdkVersion='21'/>
 </manifest>
diff --git a/firestore/firestore_resources/build.gradle b/firestore/firestore_resources/build.gradle
index cf82a08901..d2406145de 100644
--- a/firestore/firestore_resources/build.gradle
+++ b/firestore/firestore_resources/build.gradle
@@ -36,7 +36,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 33
+  compileSdkVersion 34
 
   sourceSets {
     main {
diff --git a/firestore/integration_test/LibraryManifest.xml b/firestore/integration_test/LibraryManifest.xml
index 870c85c686..2a412761c2 100644
--- a/firestore/integration_test/LibraryManifest.xml
+++ b/firestore/integration_test/LibraryManifest.xml
@@ -18,6 +18,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.firebase.cpp.firestore.testapp.lib" >
 
-    <uses-sdk android:minSdkVersion='14'/>
+    <uses-sdk android:minSdkVersion='21'/>
     <application />
 </manifest>
diff --git a/firestore/integration_test/build.gradle b/firestore/integration_test/build.gradle
index 877ea4d19f..91b9c8d6d4 100644
--- a/firestore/integration_test/build.gradle
+++ b/firestore/integration_test/build.gradle
@@ -40,7 +40,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 33
+  compileSdkVersion 34
   ndkPath System.getenv('ANDROID_NDK_HOME')
   buildToolsVersion '30.0.2'
 
@@ -55,8 +55,8 @@ android {
 
   defaultConfig {
     applicationId 'com.google.firebase.cpp.firestore.testapp'
-    minSdkVersion 19
-    targetSdkVersion 28
+    minSdkVersion 21
+    targetSdkVersion 34
     versionCode 1
     versionName '1.0'
     externalNativeBuild.cmake {
diff --git a/firestore/integration_test_internal/LibraryManifest.xml b/firestore/integration_test_internal/LibraryManifest.xml
index 870c85c686..2a412761c2 100644
--- a/firestore/integration_test_internal/LibraryManifest.xml
+++ b/firestore/integration_test_internal/LibraryManifest.xml
@@ -18,6 +18,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.firebase.cpp.firestore.testapp.lib" >
 
-    <uses-sdk android:minSdkVersion='14'/>
+    <uses-sdk android:minSdkVersion='21'/>
     <application />
 </manifest>
diff --git a/firestore/integration_test_internal/build.gradle b/firestore/integration_test_internal/build.gradle
index 64d149b6ad..5f3af90fae 100644
--- a/firestore/integration_test_internal/build.gradle
+++ b/firestore/integration_test_internal/build.gradle
@@ -40,7 +40,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 33
+  compileSdkVersion 34
   ndkPath System.getenv('ANDROID_NDK_HOME')
   buildToolsVersion '30.0.2'
 
@@ -63,8 +63,8 @@ android {
 
   defaultConfig {
     applicationId 'com.google.firebase.cpp.firestore.testapp'
-    minSdkVersion 19
-    targetSdkVersion 28
+    minSdkVersion 21
+    targetSdkVersion 34
     versionCode 1
     versionName '1.0'
     externalNativeBuild.cmake {
diff --git a/functions/build.gradle b/functions/build.gradle
index ac1d7ca2d2..817064b4d8 100644
--- a/functions/build.gradle
+++ b/functions/build.gradle
@@ -31,7 +31,7 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 33
+  compileSdkVersion 34
   ndkPath System.getenv('ANDROID_NDK_HOME')
   buildToolsVersion '30.0.2'
 
@@ -48,8 +48,8 @@ android {
   }
 
   defaultConfig {
-    minSdkVersion 19
-    targetSdkVersion 28
+    minSdkVersion 21
+    targetSdkVersion 34
     versionCode 1
     versionName "1.0"
 
diff --git a/functions/integration_test/LibraryManifest.xml b/functions/integration_test/LibraryManifest.xml
index f6f30c8a3b..2ac3fe1eb2 100644
--- a/functions/integration_test/LibraryManifest.xml
+++ b/functions/integration_test/LibraryManifest.xml
@@ -18,6 +18,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.firebase.cpp.functions.testapp.lib" >
 
-    <uses-sdk android:minSdkVersion='14'/>
+    <uses-sdk android:minSdkVersion='21'/>
     <application />
 </manifest>
diff --git a/functions/integration_test/build.gradle b/functions/integration_test/build.gradle
index 644d111afb..7bb5677cb3 100644
--- a/functions/integration_test/build.gradle
+++ b/functions/integration_test/build.gradle
@@ -40,7 +40,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 33
+  compileSdkVersion 34
   ndkPath System.getenv('ANDROID_NDK_HOME')
   buildToolsVersion '30.0.2'
 
@@ -55,8 +55,8 @@ android {
 
   defaultConfig {
     applicationId 'com.google.firebase.cpp.functions.testapp'
-    minSdkVersion 19
-    targetSdkVersion 28
+    minSdkVersion 21
+    targetSdkVersion 34
     versionCode 1
     versionName '1.0'
     externalNativeBuild.cmake {
diff --git a/gma/build.gradle b/gma/build.gradle
index 8788d55400..ca5fae22ea 100644
--- a/gma/build.gradle
+++ b/gma/build.gradle
@@ -31,7 +31,7 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 33
+  compileSdkVersion 34
   ndkPath System.getenv('ANDROID_NDK_HOME')
   buildToolsVersion '30.0.2'
 
@@ -48,8 +48,8 @@ android {
   }
 
   defaultConfig {
-    minSdkVersion 19
-    targetSdkVersion 28
+    minSdkVersion 21
+    targetSdkVersion 34
     versionCode 1
     versionName "1.0"
 
diff --git a/gma/gma_resources/AndroidManifest.xml b/gma/gma_resources/AndroidManifest.xml
index 02feeb8dfa..a1b79a2860 100644
--- a/gma/gma_resources/AndroidManifest.xml
+++ b/gma/gma_resources/AndroidManifest.xml
@@ -2,5 +2,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.FirebaseCppSdkBuild">
   <uses-permission android:name="android.permission.INTERNET"/>
-  <uses-sdk android:minSdkVersion="3"/>
+  <uses-sdk android:minSdkVersion='21'/>
 </manifest>
diff --git a/gma/gma_resources/build.gradle b/gma/gma_resources/build.gradle
index e7bab72eeb..644b6ba172 100644
--- a/gma/gma_resources/build.gradle
+++ b/gma/gma_resources/build.gradle
@@ -37,7 +37,7 @@ android {
     targetCompatibility 1.8
   }
 
-  compileSdkVersion 33
+  compileSdkVersion 34
 
   sourceSets {
     main {
diff --git a/gma/integration_test/LibraryManifest.xml b/gma/integration_test/LibraryManifest.xml
index 2a7d75f797..49db80a361 100644
--- a/gma/integration_test/LibraryManifest.xml
+++ b/gma/integration_test/LibraryManifest.xml
@@ -18,6 +18,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.admob.testapp.lib" >
 
-    <uses-sdk android:minSdkVersion='16'/>
+    <uses-sdk android:minSdkVersion='21'/>
     <application />
 </manifest>
diff --git a/gma/integration_test/build.gradle b/gma/integration_test/build.gradle
index aa05d340b9..45b9164abc 100644
--- a/gma/integration_test/build.gradle
+++ b/gma/integration_test/build.gradle
@@ -40,7 +40,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 33
+  compileSdkVersion 34
   ndkPath System.getenv('ANDROID_NDK_HOME')
   buildToolsVersion '30.0.2'
 
@@ -56,7 +56,7 @@ android {
   defaultConfig {
     applicationId 'com.google.android.admob.testapp'
     minSdkVersion 21
-    targetSdkVersion 28
+    targetSdkVersion 34
     versionCode 1
     versionName '1.0'
     externalNativeBuild.cmake {
diff --git a/installations/build.gradle b/installations/build.gradle
index 17bdb76c78..dad9ade00b 100644
--- a/installations/build.gradle
+++ b/installations/build.gradle
@@ -31,7 +31,7 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 33
+  compileSdkVersion 34
   ndkPath System.getenv('ANDROID_NDK_HOME')
   buildToolsVersion '30.0.2'
 
@@ -48,8 +48,8 @@ android {
   }
 
   defaultConfig {
-    minSdkVersion 19
-    targetSdkVersion 28
+    minSdkVersion 21
+    targetSdkVersion 34
     versionCode 1
     versionName "1.0"
 
diff --git a/installations/integration_test/LibraryManifest.xml b/installations/integration_test/LibraryManifest.xml
index 1cb12f3a83..b7804ff346 100644
--- a/installations/integration_test/LibraryManifest.xml
+++ b/installations/integration_test/LibraryManifest.xml
@@ -18,6 +18,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.firebase.fis.testapp.lib" >
 
-    <uses-sdk android:minSdkVersion='14'/>
+    <uses-sdk android:minSdkVersion='21'/>
     <application />
 </manifest>
diff --git a/installations/integration_test/build.gradle b/installations/integration_test/build.gradle
index 87e60a9686..9a39412279 100644
--- a/installations/integration_test/build.gradle
+++ b/installations/integration_test/build.gradle
@@ -40,7 +40,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 33
+  compileSdkVersion 34
   ndkPath System.getenv('ANDROID_NDK_HOME')
   buildToolsVersion '30.0.2'
 
@@ -55,8 +55,8 @@ android {
 
   defaultConfig {
     applicationId 'com.google.firebase.fis.testapp'
-    minSdkVersion 19
-    targetSdkVersion 28
+    minSdkVersion 21
+    targetSdkVersion 34
     versionCode 1
     versionName '1.0'
     externalNativeBuild.cmake {
diff --git a/messaging/AndroidManifest.xml b/messaging/AndroidManifest.xml
index 45f1e91e1f..e91d77efa2 100644
--- a/messaging/AndroidManifest.xml
+++ b/messaging/AndroidManifest.xml
@@ -3,7 +3,7 @@
           package="${applicationId}"
           android:versionCode="1"
           android:versionName="1.0">
-  <uses-sdk android:minSdkVersion="10" />
+  <uses-sdk android:minSdkVersion='21' />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
 
diff --git a/messaging/build.gradle b/messaging/build.gradle
index 729b3e1906..1c1ada82b2 100644
--- a/messaging/build.gradle
+++ b/messaging/build.gradle
@@ -31,7 +31,7 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 33
+  compileSdkVersion 34
   ndkPath System.getenv('ANDROID_NDK_HOME')
   buildToolsVersion '30.0.2'
 
@@ -48,8 +48,8 @@ android {
   }
 
   defaultConfig {
-    minSdkVersion 19
-    targetSdkVersion 28
+    minSdkVersion 21
+    targetSdkVersion 34
     versionCode 1
     versionName "1.0"
 
diff --git a/messaging/integration_test/LibraryManifest.xml b/messaging/integration_test/LibraryManifest.xml
index b84b9a1ed9..6cb2278919 100644
--- a/messaging/integration_test/LibraryManifest.xml
+++ b/messaging/integration_test/LibraryManifest.xml
@@ -18,6 +18,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.firebase.cpp.messaging.testapp.lib" >
 
-    <uses-sdk android:minSdkVersion='14'/>
+    <uses-sdk android:minSdkVersion='21'/>
     <application />
 </manifest>
diff --git a/messaging/integration_test/build.gradle b/messaging/integration_test/build.gradle
index 3991e49a24..9135e9c1d1 100644
--- a/messaging/integration_test/build.gradle
+++ b/messaging/integration_test/build.gradle
@@ -40,7 +40,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 33
+  compileSdkVersion 34
   ndkPath System.getenv('ANDROID_NDK_HOME')
   buildToolsVersion '30.0.2'
 
@@ -55,8 +55,8 @@ android {
 
   defaultConfig {
     applicationId 'com.google.firebase.cpp.messaging.testapp'
-    minSdkVersion 19
-    targetSdkVersion 28
+    minSdkVersion 21
+    targetSdkVersion 34
     versionCode 1
     versionName '1.0'
     externalNativeBuild.cmake {
diff --git a/messaging/messaging_java/build.gradle b/messaging/messaging_java/build.gradle
index 74225efeaf..a740ae4e8e 100644
--- a/messaging/messaging_java/build.gradle
+++ b/messaging/messaging_java/build.gradle
@@ -41,10 +41,10 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 33
+  compileSdkVersion 34
 
   defaultConfig {
-    minSdkVersion 14
+    minSdkVersion 21
   }
 
   sourceSets {
diff --git a/messaging/src/android/java/LibraryManifest.xml b/messaging/src/android/java/LibraryManifest.xml
index 56359b0de4..61dab33cd5 100644
--- a/messaging/src/android/java/LibraryManifest.xml
+++ b/messaging/src/android/java/LibraryManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.gms.messaging.cpp" >
-    <uses-sdk android:minSdkVersion='14'/>
+    <uses-sdk android:minSdkVersion='21'/>
     <application>
         <service
             android:name="MessageForwardingService"
diff --git a/release_build_files/readme.md b/release_build_files/readme.md
index 0239ebec99..37f54047e0 100644
--- a/release_build_files/readme.md
+++ b/release_build_files/readme.md
@@ -631,6 +631,11 @@ workflow use only during the development of your app, not for publicly shipping
 code.
 
 ## Release Notes
+### Upcoming Release
+-   Changes
+    - General (Android): Updated minSdkVersion to 21, and targetSdkVersion
+      and compileSdkVersion to 34.
+
 ### 11.10.0
 -   Changes
     - General (Android): Update to Firebase Android BoM version 32.8.1.
diff --git a/remote_config/build.gradle b/remote_config/build.gradle
index 1506391b16..232857049f 100644
--- a/remote_config/build.gradle
+++ b/remote_config/build.gradle
@@ -31,7 +31,7 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 33
+  compileSdkVersion 34
   ndkPath System.getenv('ANDROID_NDK_HOME')
   buildToolsVersion '30.0.2'
 
@@ -48,8 +48,8 @@ android {
   }
 
   defaultConfig {
-    minSdkVersion 19
-    targetSdkVersion 28
+    minSdkVersion 21
+    targetSdkVersion 34
     versionCode 1
     versionName "1.0"
 
diff --git a/remote_config/integration_test/LibraryManifest.xml b/remote_config/integration_test/LibraryManifest.xml
index ea4252efc6..b5862a99ac 100644
--- a/remote_config/integration_test/LibraryManifest.xml
+++ b/remote_config/integration_test/LibraryManifest.xml
@@ -18,6 +18,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.remoteconfig.testapp.lib" >
 
-    <uses-sdk android:minSdkVersion='14'/>
+    <uses-sdk android:minSdkVersion='21'/>
     <application />
 </manifest>
diff --git a/remote_config/integration_test/build.gradle b/remote_config/integration_test/build.gradle
index c56ef4c1b4..6764c5c2c5 100644
--- a/remote_config/integration_test/build.gradle
+++ b/remote_config/integration_test/build.gradle
@@ -40,7 +40,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 33
+  compileSdkVersion 34
   ndkPath System.getenv('ANDROID_NDK_HOME')
   buildToolsVersion '30.0.2'
 
@@ -55,8 +55,8 @@ android {
 
   defaultConfig {
     applicationId 'com.google.android.remoteconfig.testapp'
-    minSdkVersion 19
-    targetSdkVersion 28
+    minSdkVersion 21
+    targetSdkVersion 34
     versionCode 1
     versionName '1.0'
     externalNativeBuild.cmake {
diff --git a/remote_config/remote_config_resources/build.gradle b/remote_config/remote_config_resources/build.gradle
index 6f05c3d771..d6806711ef 100644
--- a/remote_config/remote_config_resources/build.gradle
+++ b/remote_config/remote_config_resources/build.gradle
@@ -36,7 +36,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 33
+  compileSdkVersion 34
 
   sourceSets {
     main {
diff --git a/scripts/gha/ui_testing/uitest_android/app/build.gradle b/scripts/gha/ui_testing/uitest_android/app/build.gradle
index 60c7f8aeba..6b2b93c72b 100644
--- a/scripts/gha/ui_testing/uitest_android/app/build.gradle
+++ b/scripts/gha/ui_testing/uitest_android/app/build.gradle
@@ -15,14 +15,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
     ndkPath System.getenv('ANDROID_NDK_HOME')
     buildToolsVersion '30.0.2'
 
     defaultConfig {
         applicationId "com.google.firebase.uitest"
-        minSdkVersion 18
-        targetSdkVersion 29
+        minSdkVersion 21
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
 
diff --git a/storage/build.gradle b/storage/build.gradle
index 6beac37d90..598bf76710 100644
--- a/storage/build.gradle
+++ b/storage/build.gradle
@@ -31,7 +31,7 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 33
+  compileSdkVersion 34
   ndkPath System.getenv('ANDROID_NDK_HOME')
   buildToolsVersion '30.0.2'
 
@@ -48,8 +48,8 @@ android {
   }
 
   defaultConfig {
-    minSdkVersion 19
-    targetSdkVersion 28
+    minSdkVersion 21
+    targetSdkVersion 34
     versionCode 1
     versionName "1.0"
 
diff --git a/storage/integration_test/LibraryManifest.xml b/storage/integration_test/LibraryManifest.xml
index 0d5ba54201..698b707132 100644
--- a/storage/integration_test/LibraryManifest.xml
+++ b/storage/integration_test/LibraryManifest.xml
@@ -18,6 +18,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.firebase.cpp.storage.testapp.lib" >
 
-    <uses-sdk android:minSdkVersion='14'/>
+    <uses-sdk android:minSdkVersion='21'/>
     <application />
 </manifest>
diff --git a/storage/integration_test/build.gradle b/storage/integration_test/build.gradle
index ca5a4887d3..be44073323 100644
--- a/storage/integration_test/build.gradle
+++ b/storage/integration_test/build.gradle
@@ -40,7 +40,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 33
+  compileSdkVersion 34
   ndkPath System.getenv('ANDROID_NDK_HOME')
   buildToolsVersion '30.0.2'
 
@@ -55,8 +55,8 @@ android {
 
   defaultConfig {
     applicationId 'com.google.firebase.cpp.storage.testapp'
-    minSdkVersion 19
-    targetSdkVersion 28
+    minSdkVersion 21
+    targetSdkVersion 34
     versionCode 1
     versionName '1.0'
     externalNativeBuild.cmake {
diff --git a/storage/storage_resources/build.gradle b/storage/storage_resources/build.gradle
index 34750563b5..c884d03c44 100644
--- a/storage/storage_resources/build.gradle
+++ b/storage/storage_resources/build.gradle
@@ -36,7 +36,7 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
-  compileSdkVersion 33
+  compileSdkVersion 34
 
   sourceSets {
     main {
diff --git a/testing/build.gradle b/testing/build.gradle
index 21dba4ad7c..8779626e5c 100644
--- a/testing/build.gradle
+++ b/testing/build.gradle
@@ -34,7 +34,7 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 33
+  compileSdkVersion 34
   ndkPath System.getenv('ANDROID_NDK_HOME')
   buildToolsVersion '30.0.2'
 
@@ -49,8 +49,8 @@ android {
   }
 
   defaultConfig {
-    minSdkVersion 19
-    targetSdkVersion 28
+    minSdkVersion 21
+    targetSdkVersion 34
     versionCode 1
     versionName "1.0"
 

From d9f9e1cda096b8df23424ffcf74256f7da3418af Mon Sep 17 00:00:00 2001
From: Jon Simantov <jsimantov@google.com>
Date: Wed, 17 Apr 2024 10:47:10 -0700
Subject: [PATCH 2/3] Add exported=false to default manifests.

---
 analytics/integration_test/AndroidManifest.xml                  | 1 +
 app/integration_test/AndroidManifest.xml                        | 1 +
 app_check/integration_test/AndroidManifest.xml                  | 1 +
 auth/integration_test/AndroidManifest.xml                       | 1 +
 database/integration_test/AndroidManifest.xml                   | 1 +
 dynamic_links/integration_test/AndroidManifest.xml              | 1 +
 firestore/integration_test/AndroidManifest.xml                  | 1 +
 firestore/integration_test_internal/AndroidManifest.xml         | 1 +
 functions/integration_test/AndroidManifest.xml                  | 1 +
 gma/integration_test/AndroidManifest.xml                        | 1 +
 installations/integration_test/AndroidManifest.xml              | 1 +
 messaging/samples/AndroidManifest.xml                           | 1 +
 remote_config/integration_test/AndroidManifest.xml              | 1 +
 .../gameloop_android/app/src/main/AndroidManifest.xml           | 2 +-
 storage/integration_test/AndroidManifest.xml                    | 1 +
 15 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/analytics/integration_test/AndroidManifest.xml b/analytics/integration_test/AndroidManifest.xml
index ebe7ffaea6..317c629779 100644
--- a/analytics/integration_test/AndroidManifest.xml
+++ b/analytics/integration_test/AndroidManifest.xml
@@ -24,6 +24,7 @@
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
+              android:exported="false"
               android:screenOrientation="portrait"
               android:configChanges="orientation|screenSize">
       <meta-data android:name="android.app.lib_name"
diff --git a/app/integration_test/AndroidManifest.xml b/app/integration_test/AndroidManifest.xml
index 3d7f17903e..475ea94b19 100644
--- a/app/integration_test/AndroidManifest.xml
+++ b/app/integration_test/AndroidManifest.xml
@@ -24,6 +24,7 @@
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
+              android:exported="false"
               android:screenOrientation="portrait"
               android:configChanges="orientation|screenSize">
       <meta-data android:name="android.app.lib_name"
diff --git a/app_check/integration_test/AndroidManifest.xml b/app_check/integration_test/AndroidManifest.xml
index 4751790d91..846f4a713c 100644
--- a/app_check/integration_test/AndroidManifest.xml
+++ b/app_check/integration_test/AndroidManifest.xml
@@ -24,6 +24,7 @@
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
+              android:exported="false"
               android:screenOrientation="portrait"
               android:configChanges="orientation|screenSize">
       <meta-data android:name="android.app.lib_name"
diff --git a/auth/integration_test/AndroidManifest.xml b/auth/integration_test/AndroidManifest.xml
index 04eef11c90..c4c276c153 100644
--- a/auth/integration_test/AndroidManifest.xml
+++ b/auth/integration_test/AndroidManifest.xml
@@ -24,6 +24,7 @@
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
+              android:exported="false"
               android:screenOrientation="portrait"
               android:configChanges="orientation|screenSize">
       <meta-data android:name="android.app.lib_name"
diff --git a/database/integration_test/AndroidManifest.xml b/database/integration_test/AndroidManifest.xml
index c0251204fd..a84921a5ce 100644
--- a/database/integration_test/AndroidManifest.xml
+++ b/database/integration_test/AndroidManifest.xml
@@ -24,6 +24,7 @@
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
+              android:exported="false"
               android:screenOrientation="portrait"
               android:configChanges="orientation|screenSize">
       <meta-data android:name="android.app.lib_name"
diff --git a/dynamic_links/integration_test/AndroidManifest.xml b/dynamic_links/integration_test/AndroidManifest.xml
index d3effcad4f..5a11ff56f0 100644
--- a/dynamic_links/integration_test/AndroidManifest.xml
+++ b/dynamic_links/integration_test/AndroidManifest.xml
@@ -24,6 +24,7 @@
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
+              android:exported="false"
               android:screenOrientation="portrait"
               android:configChanges="orientation|screenSize">
       <meta-data android:name="android.app.lib_name"
diff --git a/firestore/integration_test/AndroidManifest.xml b/firestore/integration_test/AndroidManifest.xml
index ada4f0f225..518cbefbc2 100644
--- a/firestore/integration_test/AndroidManifest.xml
+++ b/firestore/integration_test/AndroidManifest.xml
@@ -24,6 +24,7 @@
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
+              android:exported="false"
               android:screenOrientation="portrait"
               android:configChanges="orientation|screenSize">
       <meta-data android:name="android.app.lib_name"
diff --git a/firestore/integration_test_internal/AndroidManifest.xml b/firestore/integration_test_internal/AndroidManifest.xml
index 0e36543bf4..402d95b6b1 100644
--- a/firestore/integration_test_internal/AndroidManifest.xml
+++ b/firestore/integration_test_internal/AndroidManifest.xml
@@ -24,6 +24,7 @@
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
+              android:exported="false"
               android:screenOrientation="portrait"
               android:configChanges="orientation|screenSize">
       <meta-data android:name="android.app.lib_name"
diff --git a/functions/integration_test/AndroidManifest.xml b/functions/integration_test/AndroidManifest.xml
index 9982a95e43..285eaa2db6 100644
--- a/functions/integration_test/AndroidManifest.xml
+++ b/functions/integration_test/AndroidManifest.xml
@@ -24,6 +24,7 @@
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
+              android:exported="false"
               android:screenOrientation="portrait"
               android:configChanges="orientation|screenSize">
       <meta-data android:name="android.app.lib_name"
diff --git a/gma/integration_test/AndroidManifest.xml b/gma/integration_test/AndroidManifest.xml
index 9cc47e3d27..89b4a347b4 100644
--- a/gma/integration_test/AndroidManifest.xml
+++ b/gma/integration_test/AndroidManifest.xml
@@ -28,6 +28,7 @@
         android:name="com.google.android.gms.ads.APPLICATION_ID"
         android:value="ca-app-pub-3940256099942544~3347511713"/>
     <activity android:name="android.app.NativeActivity"
+              android:exported="false"
               android:screenOrientation="portrait"
               android:configChanges="orientation|screenSize">
       <meta-data android:name="android.app.lib_name"
diff --git a/installations/integration_test/AndroidManifest.xml b/installations/integration_test/AndroidManifest.xml
index baf79eb982..a51e208d02 100644
--- a/installations/integration_test/AndroidManifest.xml
+++ b/installations/integration_test/AndroidManifest.xml
@@ -24,6 +24,7 @@
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
+              android:exported="false"
               android:screenOrientation="portrait"
               android:configChanges="orientation|screenSize">
       <meta-data android:name="android.app.lib_name"
diff --git a/messaging/samples/AndroidManifest.xml b/messaging/samples/AndroidManifest.xml
index 98c9e48716..bc3e06aef2 100644
--- a/messaging/samples/AndroidManifest.xml
+++ b/messaging/samples/AndroidManifest.xml
@@ -21,6 +21,7 @@
             android:screenOrientation="landscape"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/app_name"
+            android:exported="false"
             android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/remote_config/integration_test/AndroidManifest.xml b/remote_config/integration_test/AndroidManifest.xml
index 338223292e..92b4081bfa 100644
--- a/remote_config/integration_test/AndroidManifest.xml
+++ b/remote_config/integration_test/AndroidManifest.xml
@@ -24,6 +24,7 @@
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
+              android:exported="false"
               android:screenOrientation="portrait"
               android:configChanges="orientation|screenSize">
       <meta-data android:name="android.app.lib_name"
diff --git a/scripts/gha/integration_testing/gameloop_android/app/src/main/AndroidManifest.xml b/scripts/gha/integration_testing/gameloop_android/app/src/main/AndroidManifest.xml
index f09fa07c07..1e3f04dd15 100644
--- a/scripts/gha/integration_testing/gameloop_android/app/src/main/AndroidManifest.xml
+++ b/scripts/gha/integration_testing/gameloop_android/app/src/main/AndroidManifest.xml
@@ -11,7 +11,7 @@
       android:supportsRtl="true"
       android:theme="@style/AppTheme">
 
-    <activity android:name=".MainActivity">
+    <activity android:name=".MainActivity" android:exported="false">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
 
diff --git a/storage/integration_test/AndroidManifest.xml b/storage/integration_test/AndroidManifest.xml
index 4082136794..938913e4ae 100644
--- a/storage/integration_test/AndroidManifest.xml
+++ b/storage/integration_test/AndroidManifest.xml
@@ -24,6 +24,7 @@
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
+              android:exported="false"
               android:screenOrientation="portrait"
               android:configChanges="orientation|screenSize">
       <meta-data android:name="android.app.lib_name"

From d4430643491b6d1969dae3cecfa15cfa64311ab1 Mon Sep 17 00:00:00 2001
From: Jon Simantov <jsimantov@google.com>
Date: Thu, 18 Apr 2024 11:02:59 -0700
Subject: [PATCH 3/3] Change exported to true where needed.

---
 analytics/integration_test/AndroidManifest.xml              | 2 +-
 app/integration_test/AndroidManifest.xml                    | 2 +-
 app_check/integration_test/AndroidManifest.xml              | 2 +-
 auth/integration_test/AndroidManifest.xml                   | 2 +-
 database/integration_test/AndroidManifest.xml               | 2 +-
 dynamic_links/integration_test/AndroidManifest.xml          | 2 +-
 firestore/integration_test/AndroidManifest.xml              | 2 +-
 firestore/integration_test_internal/AndroidManifest.xml     | 2 +-
 functions/integration_test/AndroidManifest.xml              | 2 +-
 gma/integration_test/AndroidManifest.xml                    | 2 +-
 installations/integration_test/AndroidManifest.xml          | 2 +-
 messaging/AndroidManifest.xml                               | 4 ++--
 messaging/integration_test/AndroidManifest.xml              | 6 +++---
 messaging/samples/AndroidManifest.xml                       | 6 +++---
 remote_config/integration_test/AndroidManifest.xml          | 2 +-
 .../gameloop_android/app/src/main/AndroidManifest.xml       | 2 +-
 storage/integration_test/AndroidManifest.xml                | 2 +-
 17 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/analytics/integration_test/AndroidManifest.xml b/analytics/integration_test/AndroidManifest.xml
index 317c629779..b29a29f342 100644
--- a/analytics/integration_test/AndroidManifest.xml
+++ b/analytics/integration_test/AndroidManifest.xml
@@ -24,7 +24,7 @@
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
-              android:exported="false"
+              android:exported="true"
               android:screenOrientation="portrait"
               android:configChanges="orientation|screenSize">
       <meta-data android:name="android.app.lib_name"
diff --git a/app/integration_test/AndroidManifest.xml b/app/integration_test/AndroidManifest.xml
index 475ea94b19..41fc4abe71 100644
--- a/app/integration_test/AndroidManifest.xml
+++ b/app/integration_test/AndroidManifest.xml
@@ -24,7 +24,7 @@
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
-              android:exported="false"
+              android:exported="true"
               android:screenOrientation="portrait"
               android:configChanges="orientation|screenSize">
       <meta-data android:name="android.app.lib_name"
diff --git a/app_check/integration_test/AndroidManifest.xml b/app_check/integration_test/AndroidManifest.xml
index 846f4a713c..b4d19465f1 100644
--- a/app_check/integration_test/AndroidManifest.xml
+++ b/app_check/integration_test/AndroidManifest.xml
@@ -24,7 +24,7 @@
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
-              android:exported="false"
+              android:exported="true"
               android:screenOrientation="portrait"
               android:configChanges="orientation|screenSize">
       <meta-data android:name="android.app.lib_name"
diff --git a/auth/integration_test/AndroidManifest.xml b/auth/integration_test/AndroidManifest.xml
index c4c276c153..bcabcccc82 100644
--- a/auth/integration_test/AndroidManifest.xml
+++ b/auth/integration_test/AndroidManifest.xml
@@ -24,7 +24,7 @@
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
-              android:exported="false"
+              android:exported="true"
               android:screenOrientation="portrait"
               android:configChanges="orientation|screenSize">
       <meta-data android:name="android.app.lib_name"
diff --git a/database/integration_test/AndroidManifest.xml b/database/integration_test/AndroidManifest.xml
index a84921a5ce..478c370bff 100644
--- a/database/integration_test/AndroidManifest.xml
+++ b/database/integration_test/AndroidManifest.xml
@@ -24,7 +24,7 @@
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
-              android:exported="false"
+              android:exported="true"
               android:screenOrientation="portrait"
               android:configChanges="orientation|screenSize">
       <meta-data android:name="android.app.lib_name"
diff --git a/dynamic_links/integration_test/AndroidManifest.xml b/dynamic_links/integration_test/AndroidManifest.xml
index 5a11ff56f0..d737ea3ec6 100644
--- a/dynamic_links/integration_test/AndroidManifest.xml
+++ b/dynamic_links/integration_test/AndroidManifest.xml
@@ -24,7 +24,7 @@
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
-              android:exported="false"
+              android:exported="true"
               android:screenOrientation="portrait"
               android:configChanges="orientation|screenSize">
       <meta-data android:name="android.app.lib_name"
diff --git a/firestore/integration_test/AndroidManifest.xml b/firestore/integration_test/AndroidManifest.xml
index 518cbefbc2..f34ab7886d 100644
--- a/firestore/integration_test/AndroidManifest.xml
+++ b/firestore/integration_test/AndroidManifest.xml
@@ -24,7 +24,7 @@
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
-              android:exported="false"
+              android:exported="true"
               android:screenOrientation="portrait"
               android:configChanges="orientation|screenSize">
       <meta-data android:name="android.app.lib_name"
diff --git a/firestore/integration_test_internal/AndroidManifest.xml b/firestore/integration_test_internal/AndroidManifest.xml
index 402d95b6b1..d0bbe973a2 100644
--- a/firestore/integration_test_internal/AndroidManifest.xml
+++ b/firestore/integration_test_internal/AndroidManifest.xml
@@ -24,7 +24,7 @@
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
-              android:exported="false"
+              android:exported="true"
               android:screenOrientation="portrait"
               android:configChanges="orientation|screenSize">
       <meta-data android:name="android.app.lib_name"
diff --git a/functions/integration_test/AndroidManifest.xml b/functions/integration_test/AndroidManifest.xml
index 285eaa2db6..1c0b9b9c92 100644
--- a/functions/integration_test/AndroidManifest.xml
+++ b/functions/integration_test/AndroidManifest.xml
@@ -24,7 +24,7 @@
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
-              android:exported="false"
+              android:exported="true"
               android:screenOrientation="portrait"
               android:configChanges="orientation|screenSize">
       <meta-data android:name="android.app.lib_name"
diff --git a/gma/integration_test/AndroidManifest.xml b/gma/integration_test/AndroidManifest.xml
index 89b4a347b4..8aa98a1958 100644
--- a/gma/integration_test/AndroidManifest.xml
+++ b/gma/integration_test/AndroidManifest.xml
@@ -28,7 +28,7 @@
         android:name="com.google.android.gms.ads.APPLICATION_ID"
         android:value="ca-app-pub-3940256099942544~3347511713"/>
     <activity android:name="android.app.NativeActivity"
-              android:exported="false"
+              android:exported="true"
               android:screenOrientation="portrait"
               android:configChanges="orientation|screenSize">
       <meta-data android:name="android.app.lib_name"
diff --git a/installations/integration_test/AndroidManifest.xml b/installations/integration_test/AndroidManifest.xml
index a51e208d02..5f74bc1f6c 100644
--- a/installations/integration_test/AndroidManifest.xml
+++ b/installations/integration_test/AndroidManifest.xml
@@ -24,7 +24,7 @@
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
-              android:exported="false"
+              android:exported="true"
               android:screenOrientation="portrait"
               android:configChanges="orientation|screenSize">
       <meta-data android:name="android.app.lib_name"
diff --git a/messaging/AndroidManifest.xml b/messaging/AndroidManifest.xml
index e91d77efa2..1234c45d67 100644
--- a/messaging/AndroidManifest.xml
+++ b/messaging/AndroidManifest.xml
@@ -15,7 +15,7 @@
 
   <application>
     <service android:name="com.google.firebase.messaging.cpp.ListenerService"
-             android:exported="false" >
+             android:exported="true" >
       <intent-filter>
         <action android:name="com.google.firebase.MESSAGING_EVENT" />
       </intent-filter>
@@ -23,7 +23,7 @@
 
     <service android:name="com.google.firebase.messaging.cpp.RegistrationIntentService"
              android:permission="android.permission.BIND_JOB_SERVICE"
-             android:exported="false" >
+             android:exported="true" >
     </service>
   </application>
 
diff --git a/messaging/integration_test/AndroidManifest.xml b/messaging/integration_test/AndroidManifest.xml
index 08d6b95a92..e40aad746f 100644
--- a/messaging/integration_test/AndroidManifest.xml
+++ b/messaging/integration_test/AndroidManifest.xml
@@ -69,18 +69,18 @@
     <meta-data android:name="com.google.test.loops" android:value="1" />
 
     <service android:name="com.google.firebase.messaging.cpp.ListenerService"
-             android:exported="false" >
+             android:exported="true" >
       <intent-filter>
         <action android:name="com.google.firebase.MESSAGING_EVENT" />
       </intent-filter>
     </service>
 
     <service android:name="com.google.firebase.messaging.cpp.RegistrationIntentService"
-             android:exported="false" >
+             android:exported="true" >
     </service>
     <service android:name="com.google.firebase.messaging.MessageForwardingService"
              android:permission="android.permission.BIND_JOB_SERVICE"
-             android:exported="false" >
+             android:exported="true" >
     </service>
 
   </application>
diff --git a/messaging/samples/AndroidManifest.xml b/messaging/samples/AndroidManifest.xml
index bc3e06aef2..bd3c39daf6 100644
--- a/messaging/samples/AndroidManifest.xml
+++ b/messaging/samples/AndroidManifest.xml
@@ -21,7 +21,7 @@
             android:screenOrientation="landscape"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/app_name"
-            android:exported="false"
+            android:exported="true"
             android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -57,7 +57,7 @@
 
         <!-- [START messaging_add_custom_listener_service] -->
         <service android:name="com.google.firebase.messaging.cpp.samples.MyListenerService"
-                 android:exported="false">
+                 android:exported="true">
           <intent-filter>
             <action android:name="com.google.firebase.MESSAGING_EVENT"/>
           </intent-filter>
@@ -67,7 +67,7 @@
         <!-- [START messaging_forwarding_service] -->
         <service android:name="com.google.firebase.messaging.MessageForwardingService"
              android:permission="android.permission.BIND_JOB_SERVICE"
-             android:exported="false" >
+             android:exported="true" >
         </service>
         <!-- [END messaging_forwarding_service] -->
     </application>
diff --git a/remote_config/integration_test/AndroidManifest.xml b/remote_config/integration_test/AndroidManifest.xml
index 92b4081bfa..9e1209a2fa 100644
--- a/remote_config/integration_test/AndroidManifest.xml
+++ b/remote_config/integration_test/AndroidManifest.xml
@@ -24,7 +24,7 @@
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
-              android:exported="false"
+              android:exported="true"
               android:screenOrientation="portrait"
               android:configChanges="orientation|screenSize">
       <meta-data android:name="android.app.lib_name"
diff --git a/scripts/gha/integration_testing/gameloop_android/app/src/main/AndroidManifest.xml b/scripts/gha/integration_testing/gameloop_android/app/src/main/AndroidManifest.xml
index 1e3f04dd15..ae99f2ab57 100644
--- a/scripts/gha/integration_testing/gameloop_android/app/src/main/AndroidManifest.xml
+++ b/scripts/gha/integration_testing/gameloop_android/app/src/main/AndroidManifest.xml
@@ -11,7 +11,7 @@
       android:supportsRtl="true"
       android:theme="@style/AppTheme">
 
-    <activity android:name=".MainActivity" android:exported="false">
+    <activity android:name=".MainActivity" android:exported="true">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
 
diff --git a/storage/integration_test/AndroidManifest.xml b/storage/integration_test/AndroidManifest.xml
index 938913e4ae..d65cb9e9b3 100644
--- a/storage/integration_test/AndroidManifest.xml
+++ b/storage/integration_test/AndroidManifest.xml
@@ -24,7 +24,7 @@
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <application android:label="@string/app_name">
     <activity android:name="android.app.NativeActivity"
-              android:exported="false"
+              android:exported="true"
               android:screenOrientation="portrait"
               android:configChanges="orientation|screenSize">
       <meta-data android:name="android.app.lib_name"