[automerger skipped] Merge "Merge Android 14 QPR3 to AOSP main" into main am: 35d84e5f7e -s ours am: 83d3679896 -s ours

am skip reason: Merged-In I9b167eb25bc8a0339d5d5356c0f732410734b6f6 with SHA-1 7a7a6b69d9 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/google/av/+/3131389

Change-Id: I41c0fa046586143f0d0e52d2a94c116811608f79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

media/eco/ECOService.cpp

diff --git a/media/eco/ECOService.cpp b/media/eco/ECOService.cpp
index 557e24a..0dfdf0b 100644
--- a/media/eco/ECOService.cpp
+++ b/media/eco/ECOService.cpp
@@ -73,8 +73,10 @@
     SanitizeSession([&](MapIterType iter) {
         if (iter->first == newCfg) {
             std::shared_ptr<ECOSession> session = iter->second.lock();
-            foundSession = true;
-            *_aidl_return = session;
+            if (session != nullptr) {
+                foundSession = true;
+                *_aidl_return = session;
+            }
         }
     });
 
@@ -113,7 +115,9 @@
     Mutex::Autolock lock(mServiceLock);
     SanitizeSession([&](MapIterType iter) {
         std::shared_ptr<ECOSession> session = iter->second.lock();
-        _aidl_return->push_back(session->asBinder());
+        if (session != nullptr) {
+            _aidl_return->push_back(session->asBinder());
+        }
     });
     return ndk::ScopedAStatus::ok();
 }