Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33df7bdd authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "cameraserver: Fix logic to skip callbacks for non HAL3 devices for... 

Merge "cameraserver: Fix logic to skip callbacks for non HAL3 devices for vendor listeners." am: 27c20f48

Change-Id: I0f57526be1c6782a97efaad66b0f3f44b47f143f
parents b13b01d5 27c20f48

services/camera/libcameraservice/CameraService.cpp

+9 −2
Original line number Diff line number Diff line
@@ -3309,8 +3309,15 @@ void CameraService::updateStatus(StatusInternal status, const String8& cameraId, 
            Mutex::Autolock lock(mStatusListenerLock);



            for (auto& listener : mListenerList) {

                if (!listener.first &&  (isHidden || !supportsHAL3)) {

                    ALOGV("Skipping camera discovery callback for system-only / HAL1 camera %s",

                bool isVendorListener = listener.first;

                if (isVendorListener && !supportsHAL3) {

                    ALOGV("Skipping vendor listener camera discovery callback for  HAL1 camera %s",

                            cameraId.c_str());

                    continue;

                }



                if (!isVendorListener && isHidden) {

                    ALOGV("Skipping camera discovery callback for system-only camera %s",

                          cameraId.c_str());

                    continue;

                }