commit 27c20f484c31ca66b84c43e1cdd09908b0d13c28
author Treehugger Robot <treehugger-gerrit@google.com> Thu Mar 12 01:12:52 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 12 01:12:52 2020 +0000
tree e326bfab82363f680a4a17ef62cb68aaa21466e5
parent ed7c7e6f62442fd2fd4982645d082378a8832e14
parent edfb26069d7548ea33ec379f39768de5622ea7f4

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

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index c566485..595c3e8 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -3309,8 +3309,15 @@
             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;
                 }