diff --git a/messaging/src/android/cpp/messaging.cc b/messaging/src/android/cpp/messaging.cc index 8f5d257bec..0f3a8e04e2 100644 --- a/messaging/src/android/cpp/messaging.cc +++ b/messaging/src/android/cpp/messaging.cc @@ -677,6 +677,7 @@ void Terminate() { } internal::UnregisterTerminateOnDefaultAppDestroy(); JNIEnv* env = g_app->GetJNIEnv(); + util::CancelCallbacks(env, kApiIdentifier); // Dereference the app. { MutexLock lock(g_app_mutex); diff --git a/release_build_files/readme.md b/release_build_files/readme.md index 739dc91794..392024ae91 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -574,6 +574,8 @@ code. ([#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)) + ([#745](https://github.com/firebase/firebase-cpp-sdk/pull/745)) + ### 8.7.0 - Changes