From 6dbe35bada60efe4c9b4bd59f3b71693aa2de4bd Mon Sep 17 00:00:00 2001 From: chen0088 Date: Thu, 11 Apr 2024 11:30:47 +0800 Subject: [PATCH] fix:usb camera Signed-off-by: chen0088 --- .../cameraoperator/handler/src/dcamera_handler.cpp | 3 ++- .../unittest/common/dcamerahandler/dcamera_handler_test.cpp | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/services/cameraservice/cameraoperator/handler/src/dcamera_handler.cpp b/services/cameraservice/cameraoperator/handler/src/dcamera_handler.cpp index f284fee1..a23c76bd 100644 --- a/services/cameraservice/cameraoperator/handler/src/dcamera_handler.cpp +++ b/services/cameraservice/cameraoperator/handler/src/dcamera_handler.cpp @@ -63,7 +63,8 @@ std::vector DCameraHandler::Query() return itemList; } for (auto& info : cameraList) { - if (info->GetConnectionType() != CameraStandard::ConnectionType::CAMERA_CONNECTION_BUILT_IN) { + if ((info->GetConnectionType() != CameraStandard::ConnectionType::CAMERA_CONNECTION_BUILT_IN) && + (info->GetConnectionType() != CameraStandard::ConnectionType::CAMERA_CONNECTION_USB_PLUGIN)) { DHLOGI("connection type: %{public}d", info->GetConnectionType()); continue; } diff --git a/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/dcamera_handler_test.cpp b/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/dcamera_handler_test.cpp index 3be0f142..5ccdce02 100644 --- a/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/dcamera_handler_test.cpp +++ b/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/dcamera_handler_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -249,6 +249,9 @@ HWTEST_F(DCameraHandlerTest, dcamera_handler_test_008, TestSize.Level1) ret = DCameraHandler::GetInstance().IsValid(SNAPSHOT_FRAME, size1); EXPECT_EQ(ret, false); + ret = DCameraHandler::GetInstance().IsValid(CONTINUOUS_FRAME, size1); + EXPECT_EQ(ret, false); + int32_t invalidParam = 2; auto type = static_cast(invalidParam); ret = DCameraHandler::GetInstance().IsValid(type, size); -- Gitee