commit eb86f93f536f3cf2b078d93462fea05b035eb58a
author Treehugger Robot <treehugger-gerrit@google.com> Wed Aug 25 00:22:52 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 25 00:22:52 2021 +0000
tree c507db61d85a23c8113e0b56d55fac3f5d7f9680
parent 8fe4685a1389fa673d0493a3abee6048a9a3dcca
parent ee1c028c6b875944815299667fc0e95977fda6d2

Merge "Fix CameraHidlTest"

camera/provider/2.4/default/LegacyCameraProviderImpl_2_4.cpp

diff --git a/camera/provider/2.4/default/LegacyCameraProviderImpl_2_4.cpp b/camera/provider/2.4/default/LegacyCameraProviderImpl_2_4.cpp
index 4cff1b7..7c3b982 100644
--- a/camera/provider/2.4/default/LegacyCameraProviderImpl_2_4.cpp
+++ b/camera/provider/2.4/default/LegacyCameraProviderImpl_2_4.cpp
@@ -450,7 +450,9 @@
         const sp<ICameraProviderCallback>& callback) {
     Mutex::Autolock _l(mCbLock);
     mCallbacks = callback;
-
+    if (mCallbacks == nullptr) {
+        return Status::OK;
+    }
     // Add and report all presenting external cameras.
     for (auto const& statusPair : mCameraStatusMap) {
         int id = std::stoi(statusPair.first);