From ee1c028c6b875944815299667fc0e95977fda6d2 Mon Sep 17 00:00:00 2001
From: yanzong chen <Yanzong.Chen@mediatek.com>
Date: Thu, 15 Jul 2021 17:36:11 +0800
Subject: [PATCH] Fix CameraHidlTest

[Description]
Add ASOP to Fix CameraHidlTest callback fail

Test:
1,build pass
2,Verified pass

Bug: 193611228

Change-Id: Icdf1cac6e67f866f5aedfaeab4095fa2efc57959
---
 camera/provider/2.4/default/LegacyCameraProviderImpl_2_4.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/camera/provider/2.4/default/LegacyCameraProviderImpl_2_4.cpp b/camera/provider/2.4/default/LegacyCameraProviderImpl_2_4.cpp
index 4cff1b79a1..7c3b982931 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 @@ Return<Status> LegacyCameraProviderImpl_2_4::setCallback(
         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);