cameraserver: filter out non-HAL3 devices from HIDL addListener.
Bug: 143192708
Test: Use vendor clients of cameraserver
Test: GCA (sanity)
Merged-In: Ic31f71887b55f3d838ca35274a5f65802ea50584
Change-Id: I51ae92d3596a962ca6ca551f8fab9fd0c77b6283
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index c70513c..44ccbbe 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -3271,9 +3271,21 @@
return;
}
bool isHidden = isPublicallyHiddenSecureCamera(cameraId);
+ bool supportsHAL3 = false;
+ // supportsCameraApi also holds mInterfaceMutex, we can't call it in the
+ // HIDL onStatusChanged wrapper call (we'll hold mStatusListenerLock and
+ // mInterfaceMutex together, which can lead to deadlocks)
+ binder::Status sRet =
+ supportsCameraApi(String16(cameraId), hardware::ICameraService::API_VERSION_2,
+ &supportsHAL3);
+ if (!sRet.isOk()) {
+ ALOGW("%s: Failed to determine if device supports HAL3 %s, supportsCameraApi call failed",
+ __FUNCTION__, cameraId.string());
+ return;
+ }
// Update the status for this camera state, then send the onStatusChangedCallbacks to each
// of the listeners with both the mStatusStatus and mStatusListenerLock held
- state->updateStatus(status, cameraId, rejectSourceStates, [this,&isHidden]
+ state->updateStatus(status, cameraId, rejectSourceStates, [this, &isHidden, &supportsHAL3]
(const String8& cameraId, StatusInternal status) {
if (status != StatusInternal::ENUMERATING) {
@@ -3295,8 +3307,8 @@
Mutex::Autolock lock(mStatusListenerLock);
for (auto& listener : mListenerList) {
- if (!listener.first && isHidden) {
- ALOGV("Skipping camera discovery callback for system-only camera %s",
+ if (!listener.first && (isHidden || !supportsHAL3)) {
+ ALOGV("Skipping camera discovery callback for system-only / HAL1 camera %s",
cameraId.c_str());
continue;
}