From 8bdbf00a34a576d0efd1c8a15839c441c132622d Mon Sep 17 00:00:00 2001 From: Emilian Peev Date: Tue, 16 May 2017 11:02:16 +0100 Subject: [PATCH] Camera: Remove binderized todo comment The camera test cases already already run in binderized mode for any devices that have this mode enabled. Additionally remove the missing camera device todo as well. This should be handled by the VTS infrastructure. Camera provider service constant updated as well. Bug: 38137798 Test: VtsHalCameraProviderV2_4TargetTest Change-Id: I45ddf224dd4dac3ddfbbd751fa297e4631283537 --- .../vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp index 7a29d425d4..02c38a4b7b 100644 --- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp +++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp @@ -90,7 +90,7 @@ using ::android::hardware::camera::device::V1_0::ICameraDevicePreviewCallback; using ::android::hardware::camera::device::V1_0::FrameCallbackFlag; using ::android::hardware::camera::device::V1_0::HandleTimestampMessage; -const char kCameraPassthroughServiceName[] = "legacy/0"; +const char kCameraLegacyServiceName[] = "legacy/0"; const uint32_t kMaxPreviewWidth = 1920; const uint32_t kMaxPreviewHeight = 1080; const uint32_t kMaxVideoWidth = 4096; @@ -185,9 +185,7 @@ private: }; void CameraHidlEnvironment::SetUp() { - // TODO: test the binderized mode - mProvider = ::testing::VtsHalHidlTargetTestBase::getService(kCameraPassthroughServiceName); - // TODO: handle the device doesn't have any camera case + mProvider = ::testing::VtsHalHidlTargetTestBase::getService(kCameraLegacyServiceName); ALOGI_IF(mProvider, "provider is not nullptr, %p", mProvider.get()); ASSERT_NE(mProvider, nullptr); }