diff --git a/messaging/src/android/cpp/messaging.cc b/messaging/src/android/cpp/messaging.cc index dff7aacea6..8f5d257bec 100644 --- a/messaging/src/android/cpp/messaging.cc +++ b/messaging/src/android/cpp/messaging.cc @@ -704,8 +704,8 @@ void Terminate() { g_firebase_messaging = nullptr; SetListener(nullptr); ReleaseClasses(env); - FutureData::Destroy(); util::Terminate(env); + FutureData::Destroy(); } // Start a service which will communicate with the Firebase Cloud Messaging diff --git a/release_build_files/readme.md b/release_build_files/readme.md index 09cddbb702..739dc91794 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -572,6 +572,8 @@ code. - Auth (Desktop): Fixed a crash in `error_code()` when a request is cancelled or times out. ([#737](https://github.com/firebase/firebase-cpp-sdk/issues/737)) + - Messaging (Android): Fixed crash during termination. + ([#739](https://github.com/firebase/firebase-cpp-sdk/pull/739)) ### 8.7.0 - Changes