Camera: Fill out vndk implementation for physical camera callbacks
Also fixed missing implementation of Camera availability callbacks for
ExtendedAvailabilityCallback.
Test: Camera CTS, and vndk test
Bug: 148146086
Change-Id: I557d6db3900b2346b7bc7e12cd946bc4c2dc4076
diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp
index 98fee12..788c051 100644
--- a/services/camera/libcameraservice/Android.bp
+++ b/services/camera/libcameraservice/Android.bp
@@ -116,6 +116,7 @@
"libyuv",
"android.frameworks.cameraservice.common@2.0",
"android.frameworks.cameraservice.service@2.0",
+ "android.frameworks.cameraservice.service@2.1",
"android.frameworks.cameraservice.device@2.0",
"android.hardware.camera.common@1.0",
"android.hardware.camera.provider@2.4",
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 5358307..e9c941e 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -456,10 +456,14 @@
}
if (updated) {
- logDeviceRemoved(id, String8::format("Device %s-%s availability changed from %d to %d",
- id.string(), physicalId.string(),
- newStatus != StatusInternal::PRESENT,
- newStatus == StatusInternal::PRESENT));
+ String8 idCombo = id + " : " + physicalId;
+ if (newStatus == StatusInternal::PRESENT) {
+ logDeviceAdded(idCombo,
+ String8::format("Device status changed to %d", newStatus));
+ } else {
+ logDeviceRemoved(idCombo,
+ String8::format("Device status changed to %d", newStatus));
+ }
String16 id16(id), physicalId16(physicalId);
Mutex::Autolock lock(mStatusListenerLock);
diff --git a/services/camera/libcameraservice/hidl/AidlCameraServiceListener.cpp b/services/camera/libcameraservice/hidl/AidlCameraServiceListener.cpp
index 110ef8e..8e619e1 100644
--- a/services/camera/libcameraservice/hidl/AidlCameraServiceListener.cpp
+++ b/services/camera/libcameraservice/hidl/AidlCameraServiceListener.cpp
@@ -25,6 +25,7 @@
namespace implementation {
using hardware::cameraservice::utils::conversion::convertToHidlCameraDeviceStatus;
+typedef frameworks::cameraservice::service::V2_1::ICameraServiceListener HCameraServiceListener2_1;
binder::Status H2BCameraServiceListener::onStatusChanged(
int32_t status, const ::android::String16& cameraId) {
@@ -40,6 +41,29 @@
return binder::Status::ok();
}
+binder::Status H2BCameraServiceListener::onPhysicalCameraStatusChanged(
+ int32_t status, const ::android::String16& cameraId,
+ const ::android::String16& physicalCameraId) {
+ auto cast2_1 = HCameraServiceListener2_1::castFrom(mBase);
+ sp<HCameraServiceListener2_1> interface2_1 = nullptr;
+ if (cast2_1.isOk()) {
+ interface2_1 = cast2_1;
+ if (interface2_1 != nullptr) {
+ HCameraDeviceStatus hCameraDeviceStatus = convertToHidlCameraDeviceStatus(status);
+ V2_1::PhysicalCameraStatusAndId cameraStatusAndId;
+ cameraStatusAndId.deviceStatus = hCameraDeviceStatus;
+ cameraStatusAndId.cameraId = String8(cameraId).string();
+ cameraStatusAndId.physicalCameraId = String8(physicalCameraId).string();
+ auto ret = interface2_1->onPhysicalCameraStatusChanged(cameraStatusAndId);
+ if (!ret.isOk()) {
+ ALOGE("%s OnPhysicalCameraStatusChanged callback failed due to %s",__FUNCTION__,
+ ret.description().c_str());
+ }
+ }
+ }
+ return binder::Status::ok();
+}
+
::android::binder::Status H2BCameraServiceListener::onTorchStatusChanged(
int32_t, const ::android::String16&) {
// We don't implement onTorchStatusChanged
diff --git a/services/camera/libcameraservice/hidl/AidlCameraServiceListener.h b/services/camera/libcameraservice/hidl/AidlCameraServiceListener.h
index 175eb8e..95493a1 100644
--- a/services/camera/libcameraservice/hidl/AidlCameraServiceListener.h
+++ b/services/camera/libcameraservice/hidl/AidlCameraServiceListener.h
@@ -19,6 +19,7 @@
#include <android/frameworks/cameraservice/common/2.0/types.h>
#include <android/frameworks/cameraservice/service/2.0/ICameraServiceListener.h>
+#include <android/frameworks/cameraservice/service/2.1/ICameraServiceListener.h>
#include <android/frameworks/cameraservice/device/2.0/types.h>
#include <android/hardware/BnCameraServiceListener.h>
#include <android/hardware/BpCameraServiceListener.h>
@@ -47,17 +48,14 @@
virtual ::android::binder::Status onStatusChanged(int32_t status,
const ::android::String16& cameraId) override;
- virtual ::android::binder::Status onPhysicalCameraStatusChanged(int32_t /*status*/,
- const ::android::String16& /*cameraId*/,
- const ::android::String16& /*physicalCameraId*/) override {
- // no implementation yet.
- return binder::Status::ok();
- }
+ virtual ::android::binder::Status onPhysicalCameraStatusChanged(int32_t status,
+ const ::android::String16& cameraId,
+ const ::android::String16& physicalCameraId) override;
virtual ::android::binder::Status onTorchStatusChanged(
int32_t status, const ::android::String16& cameraId) override;
virtual binder::Status onCameraAccessPrioritiesChanged() {
- // TODO: no implementation yet. b/148146086
+ // TODO: no implementation yet.
return binder::Status::ok();
}
};
diff --git a/services/camera/libcameraservice/hidl/Convert.cpp b/services/camera/libcameraservice/hidl/Convert.cpp
index 866c3b5..597147b 100644
--- a/services/camera/libcameraservice/hidl/Convert.cpp
+++ b/services/camera/libcameraservice/hidl/Convert.cpp
@@ -197,6 +197,23 @@
return;
}
+void convertToHidl(const std::vector<hardware::CameraStatus> &src,
+ hidl_vec<frameworks::cameraservice::service::V2_1::CameraStatusAndId>* dst) {
+ dst->resize(src.size());
+ size_t i = 0;
+ for (const auto &statusAndId : src) {
+ auto &a = (*dst)[i++];
+ a.v2_0.cameraId = statusAndId.cameraId.c_str();
+ a.v2_0.deviceStatus = convertToHidlCameraDeviceStatus(statusAndId.status);
+ size_t numUnvailPhysicalCameras = statusAndId.unavailablePhysicalIds.size();
+ a.unavailPhysicalCameraIds.resize(numUnvailPhysicalCameras);
+ for (size_t j = 0; j < numUnvailPhysicalCameras; j++) {
+ a.unavailPhysicalCameraIds[j] = statusAndId.unavailablePhysicalIds[j].c_str();
+ }
+ }
+ return;
+}
+
void convertToHidl(
const hardware::camera2::utils::SubmitInfo &submitInfo,
frameworks::cameraservice::device::V2_0::SubmitInfo *hSubmitInfo) {
diff --git a/services/camera/libcameraservice/hidl/Convert.h b/services/camera/libcameraservice/hidl/Convert.h
index 79683f6..82ffc48 100644
--- a/services/camera/libcameraservice/hidl/Convert.h
+++ b/services/camera/libcameraservice/hidl/Convert.h
@@ -23,6 +23,7 @@
#include <android/frameworks/cameraservice/device/2.0/ICameraDeviceUser.h>
#include <android/frameworks/cameraservice/common/2.0/types.h>
#include <android/frameworks/cameraservice/service/2.0/types.h>
+#include <android/frameworks/cameraservice/service/2.1/types.h>
#include <android/frameworks/cameraservice/device/2.0/types.h>
#include <android/hardware/camera/common/1.0/types.h>
#include <android/hardware/camera2/ICameraDeviceUser.h>
@@ -79,6 +80,9 @@
void convertToHidl(const std::vector<hardware::CameraStatus> &src,
hidl_vec<HCameraStatusAndId>* dst);
+void convertToHidl(const std::vector<hardware::CameraStatus> &src,
+ hidl_vec<frameworks::cameraservice::service::V2_1::CameraStatusAndId>* dst);
+
void convertToHidl(const hardware::camera2::utils::SubmitInfo &submitInfo,
HSubmitInfo *hSubmitInfo);
diff --git a/services/camera/libcameraservice/hidl/HidlCameraService.cpp b/services/camera/libcameraservice/hidl/HidlCameraService.cpp
index 97ba9c4..a46133e 100644
--- a/services/camera/libcameraservice/hidl/HidlCameraService.cpp
+++ b/services/camera/libcameraservice/hidl/HidlCameraService.cpp
@@ -154,15 +154,50 @@
Return<void> HidlCameraService::addListener(const sp<HCameraServiceListener>& hCsListener,
addListener_cb _hidl_cb) {
- if (mAidlICameraService == nullptr) {
- _hidl_cb(HStatus::UNKNOWN_ERROR, {});
+ std::vector<hardware::CameraStatus> cameraStatusAndIds{};
+ HStatus status = addListenerInternal<HCameraServiceListener>(
+ hCsListener, &cameraStatusAndIds);
+ if (status != HStatus::NO_ERROR) {
+ _hidl_cb(status, {});
return Void();
}
- if (hCsListener == nullptr) {
- ALOGE("%s listener must not be NULL", __FUNCTION__);
- _hidl_cb(HStatus::ILLEGAL_ARGUMENT, {});
+
+ hidl_vec<HCameraStatusAndId> hCameraStatusAndIds;
+ //Convert cameraStatusAndIds to HIDL and call callback
+ convertToHidl(cameraStatusAndIds, &hCameraStatusAndIds);
+ _hidl_cb(status, hCameraStatusAndIds);
+
+ return Void();
+}
+
+Return<void> HidlCameraService::addListener_2_1(const sp<HCameraServiceListener2_1>& hCsListener,
+ addListener_2_1_cb _hidl_cb) {
+ std::vector<hardware::CameraStatus> cameraStatusAndIds{};
+ HStatus status = addListenerInternal<HCameraServiceListener2_1>(
+ hCsListener, &cameraStatusAndIds);
+ if (status != HStatus::NO_ERROR) {
+ _hidl_cb(status, {});
return Void();
}
+
+ hidl_vec<frameworks::cameraservice::service::V2_1::CameraStatusAndId> hCameraStatusAndIds;
+ //Convert cameraStatusAndIds to HIDL and call callback
+ convertToHidl(cameraStatusAndIds, &hCameraStatusAndIds);
+ _hidl_cb(status, hCameraStatusAndIds);
+
+ return Void();
+}
+
+template<class T>
+HStatus HidlCameraService::addListenerInternal(const sp<T>& hCsListener,
+ std::vector<hardware::CameraStatus>* cameraStatusAndIds) {
+ if (mAidlICameraService == nullptr) {
+ return HStatus::UNKNOWN_ERROR;
+ }
+ if (hCsListener == nullptr || cameraStatusAndIds == nullptr) {
+ ALOGE("%s listener and cameraStatusAndIds must not be NULL", __FUNCTION__);
+ return HStatus::ILLEGAL_ARGUMENT;
+ }
sp<hardware::ICameraServiceListener> csListener = nullptr;
// Check the cache for previously registered callbacks
{
@@ -177,33 +212,27 @@
} else {
ALOGE("%s: Trying to add a listener %p already registered",
__FUNCTION__, hCsListener.get());
- _hidl_cb(HStatus::ILLEGAL_ARGUMENT, {});
- return Void();
+ return HStatus::ILLEGAL_ARGUMENT;
}
}
- std::vector<hardware::CameraStatus> cameraStatusAndIds{};
binder::Status serviceRet =
- mAidlICameraService->addListenerHelper(csListener, &cameraStatusAndIds, true);
+ mAidlICameraService->addListenerHelper(csListener, cameraStatusAndIds, true);
HStatus status = HStatus::NO_ERROR;
if (!serviceRet.isOk()) {
- ALOGE("%s: Unable to add camera device status listener", __FUNCTION__);
- status = B2HStatus(serviceRet);
- _hidl_cb(status, {});
- return Void();
+ ALOGE("%s: Unable to add camera device status listener", __FUNCTION__);
+ status = B2HStatus(serviceRet);
+ return status;
}
- cameraStatusAndIds.erase(std::remove_if(cameraStatusAndIds.begin(), cameraStatusAndIds.end(),
+ cameraStatusAndIds->erase(std::remove_if(cameraStatusAndIds->begin(), cameraStatusAndIds->end(),
[this](const hardware::CameraStatus& s) {
- bool supportsHAL3 = false;
- binder::Status sRet =
+ bool supportsHAL3 = false;
+ binder::Status sRet =
mAidlICameraService->supportsCameraApi(String16(s.cameraId),
hardware::ICameraService::API_VERSION_2, &supportsHAL3);
- return !sRet.isOk() || !supportsHAL3;
- }), cameraStatusAndIds.end());
- hidl_vec<HCameraStatusAndId> hCameraStatusAndIds;
- //Convert cameraStatusAndIds to HIDL and call callback
- convertToHidl(cameraStatusAndIds, &hCameraStatusAndIds);
- _hidl_cb(status, hCameraStatusAndIds);
- return Void();
+ return !sRet.isOk() || !supportsHAL3;
+ }), cameraStatusAndIds->end());
+
+ return HStatus::NO_ERROR;
}
Return<HStatus> HidlCameraService::removeListener(const sp<HCameraServiceListener>& hCsListener) {
diff --git a/services/camera/libcameraservice/hidl/HidlCameraService.h b/services/camera/libcameraservice/hidl/HidlCameraService.h
index eead0bc..097f4c5 100644
--- a/services/camera/libcameraservice/hidl/HidlCameraService.h
+++ b/services/camera/libcameraservice/hidl/HidlCameraService.h
@@ -21,7 +21,7 @@
#include <thread>
#include <android/frameworks/cameraservice/common/2.0/types.h>
-#include <android/frameworks/cameraservice/service/2.0/ICameraService.h>
+#include <android/frameworks/cameraservice/service/2.1/ICameraService.h>
#include <android/frameworks/cameraservice/service/2.0/types.h>
#include <android/frameworks/cameraservice/device/2.0/types.h>
@@ -42,8 +42,9 @@
using HCameraDeviceCallback = frameworks::cameraservice::device::V2_0::ICameraDeviceCallback;
using HCameraMetadata = frameworks::cameraservice::service::V2_0::CameraMetadata;
-using HCameraService = frameworks::cameraservice::service::V2_0::ICameraService;
+using HCameraService = frameworks::cameraservice::service::V2_1::ICameraService;
using HCameraServiceListener = frameworks::cameraservice::service::V2_0::ICameraServiceListener;
+using HCameraServiceListener2_1 = frameworks::cameraservice::service::V2_1::ICameraServiceListener;
using HStatus = frameworks::cameraservice::common::V2_0::Status;
using HCameraStatusAndId = frameworks::cameraservice::service::V2_0::CameraStatusAndId;
@@ -66,6 +67,9 @@
Return<void> getCameraVendorTagSections(getCameraVendorTagSections_cb _hidl_cb) override;
+ Return<void> addListener_2_1(const sp<HCameraServiceListener2_1>& listener,
+ addListener_2_1_cb _hidl_cb) override;
+
// This method should only be called by the cameraservers main thread to
// instantiate the hidl cameraserver.
static sp<HidlCameraService> getInstance(android::CameraService *cs);
@@ -76,6 +80,11 @@
sp<hardware::ICameraServiceListener> searchListenerCacheLocked(
sp<HCameraServiceListener> listener, /*removeIfFound*/ bool shouldRemove = false);
+
+ template<class T>
+ HStatus addListenerInternal(const sp<T>& listener,
+ std::vector<hardware::CameraStatus>* cameraStatusAndIds);
+
void addToListenerCacheLocked(sp<HCameraServiceListener> hListener,
sp<hardware::ICameraServiceListener> csListener);