Add method to get id of virtual camera
Also, add CtsVirtualDevicesCameraTestCases to virtualcamera
service postsubmit.
Test: atest CtsVirtualDevicesCameraTestCases
Bug: 310857519
Change-Id: I9f2e070a49bbf94694e996e4793a7997fbcb7b9e
diff --git a/services/camera/virtualcamera/VirtualCameraService.cc b/services/camera/virtualcamera/VirtualCameraService.cc
index 62dc08b..68a8979 100644
--- a/services/camera/virtualcamera/VirtualCameraService.cc
+++ b/services/camera/virtualcamera/VirtualCameraService.cc
@@ -109,6 +109,27 @@
return ndk::ScopedAStatus::ok();
}
+ndk::ScopedAStatus VirtualCameraService::getCameraId(
+ const ::ndk::SpAIBinder& token, int32_t* _aidl_return) {
+ if (_aidl_return == nullptr) {
+ return ndk::ScopedAStatus::fromServiceSpecificError(
+ Status::EX_ILLEGAL_ARGUMENT);
+ }
+
+ auto camera = getCamera(token);
+ if (camera == nullptr) {
+ ALOGE(
+ "Attempt to get camera id corresponding to unknown binder token: "
+ "0x%" PRIxPTR,
+ reinterpret_cast<uintptr_t>(token.get()));
+ return ndk::ScopedAStatus::ok();
+ }
+
+ *_aidl_return = camera->getCameraId();
+
+ return ndk::ScopedAStatus::ok();
+}
+
std::shared_ptr<VirtualCameraDevice> VirtualCameraService::getCamera(
const ::ndk::SpAIBinder& token) {
if (token == nullptr) {