Fix crash on gma::Initialize without a Firebase App

gma/integration_test/src/integration_test.cc

@@ -169,6 +169,12 @@ class FirebaseGmaUITest : public FirebaseGmaTest {
   void SetUp() override;
 };
 
+class FirebaseGmaMinimalTest : public FirebaseTest {
+ public:
+  FirebaseGmaMinimalTest();
+  ~FirebaseGmaMinimalTest() override;
+};
+
 // Runs GMA Tests on methods and functions that should be run
 // before GMA initializes.
 class FirebaseGmaPreInitializationTests : public FirebaseGmaTest {
@@ -283,6 +289,10 @@ firebase::gma::AdRequest FirebaseGmaTest::GetAdRequest() {
   return request;
 }
 
+FirebaseGmaMinimalTest::FirebaseGmaMinimalTest() {}
+
+FirebaseGmaMinimalTest::~FirebaseGmaMinimalTest() {}
+
 FirebaseGmaUITest::FirebaseGmaUITest() {}
 
 FirebaseGmaUITest::~FirebaseGmaUITest() {}
@@ -322,6 +332,26 @@ void FirebaseGmaPreInitializationTests::SetUpTestSuite() {
 
 // Test cases below.
 
+TEST_F(FirebaseGmaMinimalTest, TestInitializeGmaWithoutFirebase) {
+  LogDebug("Initializing GMA without a Firebase App.");
+  firebase::InitResult result;
+#if defined(ANDROID)
+  ::firebase::gma::Initialize(app_framework::GetJniEnv(),
+                              app_framework::GetActivity(), &result);
+#else   // !defined(ANDROID)
+  ::firebase::gma::Initialize(&result);
+#endif  // defined(ANDROID)
+  EXPECT_EQ(result, ::firebase::kInitResultSuccess);
+  LogDebug("Successfully initialized GMA.");
+  // Workaround: GMA does some of its initialization in the main
+  // thread, so if you terminate it too quickly after initialization
+  // it can cause issues.  Add a small delay here in case most of the
+  // tests are skipped.
+  ProcessEvents(1000);
+  LogDebug("Shutdown GMA.");
+  firebase::gma::Terminate();
+}
+
 TEST_F(FirebaseGmaPreInitializationTests, TestDisableMediationInitialization) {
   // Note: This test should be disabled or put in an entirely different test
   // binrary if we ever wish to test mediation in this application.

gma/src/android/gma_android.cc

@@ -283,11 +283,7 @@ Future<AdapterInitializationStatus> Initialize(JNIEnv* env, jobject activity,
     env->GetJavaVM(&g_java_vm);
   }
 
-  // GMA requires Google Play services if the class
-  // "com.google.android.gms.ads.internal.ClientApi" does not exist.
-  if (!util::FindClass(env, "com/google/android/gms/ads/internal/ClientApi") &&
-      google_play_services::CheckAvailability(env, activity) !=
-          google_play_services::kAvailabilityAvailable) {
+  if (!util::Initialize(env, activity)) {
     if (init_result_out) {
       *init_result_out = kInitResultFailedMissingDependency;
     }
@@ -296,7 +292,11 @@ Future<AdapterInitializationStatus> Initialize(JNIEnv* env, jobject activity,
     return Future<AdapterInitializationStatus>();
   }
 
-  if (!util::Initialize(env, activity)) {
+  // GMA requires Google Play services if the class
+  // "com.google.android.gms.ads.internal.ClientApi" does not exist.
+  if (!util::FindClass(env, "com/google/android/gms/ads/internal/ClientApi") &&
+      google_play_services::CheckAvailability(env, activity) !=
+          google_play_services::kAvailabilityAvailable) {
     if (init_result_out) {
       *init_result_out = kInitResultFailedMissingDependency;
     }

release_build_files/readme.md

@@ -634,6 +634,7 @@ code.
     - Storage (Desktop): Fixed a crash on Windows when uploading files from a
       path containing non-ANSI characters (Unicode above U+00FF).
     - Firestore: Added MultiDb support. ([#1321](https://github.com/firebase/firebase-cpp-sdk/pull/1321)).
+    - GMA (Android): Fixed a crash when Initializing GMA without a Firebase App.
 
 ### 11.0.1
 -   Changes