commit 44581dda74eb13a76dc34ada6a7c0dc6c8acdfbf
author Andy Hung <hunga@google.com> Sat Dec 07 00:05:50 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Dec 07 00:05:50 2024 +0000
tree 4c9c9fed6a50e0d3a0679afda3c2560a1728d3f2
parent 3e3a1a8f50bdf0c67cb6118ef2a1045ff75ae275
parent 0f58671cdb0f479ab62a7605428c2712cda88569

Merge "mediautils::SetviceSingleton : fix missing onServiceDied notification" into main

media/utils/include/mediautils/ServiceSingleton.h

diff --git a/media/utils/include/mediautils/ServiceSingleton.h b/media/utils/include/mediautils/ServiceSingleton.h
index fe8e9f2..f3208cb 100644
--- a/media/utils/include/mediautils/ServiceSingleton.h
+++ b/media/utils/include/mediautils/ServiceSingleton.h
@@ -299,9 +299,15 @@
                     audio_utils::unique_lock ul(mMutex);
                     auto originalService = std::get<BaseInterfaceType<Service>>(mService);
                     if (originalService != service) {
+                        if (originalService != nullptr) {
+                            invalidateService_l<Service>();
+                        }
                         mService = service;
                         mValid = true;
                         ul.unlock();
+                        if (originalService != nullptr) {
+                            traits->onServiceDied(interfaceFromBase<Service>(originalService));
+                        }
                         traits->onNewService(service);
                         ul.lock();
                         setDeathNotifier_l<Service>(service);