diff --git a/camera_hdf/hdi_impl/src/dcamera_device/dcamera_device.cpp b/camera_hdf/hdi_impl/src/dcamera_device/dcamera_device.cpp index 1883cb8..6d13bf6 100644 --- a/camera_hdf/hdi_impl/src/dcamera_device/dcamera_device.cpp +++ b/camera_hdf/hdi_impl/src/dcamera_device/dcamera_device.cpp @@ -14,10 +14,10 @@ */ #include "dcamera_device.h" -#include "anonymous_string.h" #include #include #include +#include "anonymous_string.h" #include "dcamera_host.h" #include "dcamera_provider.h" #include "dcamera_utils_tools.h" diff --git a/camera_hdf/hdi_impl/src/dcamera_host/dcamera_host.cpp b/camera_hdf/hdi_impl/src/dcamera_host/dcamera_host.cpp index 6ee19de..f9cc448 100644 --- a/camera_hdf/hdi_impl/src/dcamera_host/dcamera_host.cpp +++ b/camera_hdf/hdi_impl/src/dcamera_host/dcamera_host.cpp @@ -140,7 +140,8 @@ DCamRetCode DCameraHost::AddDCameraDevice(const std::shared_ptr &dhBase, dCameraHostCallback_->OnCameraEvent(dCameraId, CameraEvent::CAMERA_EVENT_DEVICE_ADD); } - DHLOGI("DCameraHost::AddDCameraDevice, create dcamera device success, dCameraId: %s", GetAnonyString(dCameraId).c_str()); + DHLOGI("DCameraHost::AddDCameraDevice, create dcamera device success, dCameraId: %s", + GetAnonyString(dCameraId).c_str()); return DCamRetCode::SUCCESS; } @@ -171,7 +172,8 @@ DCamRetCode DCameraHost::RemoveDCameraDevice(const std::shared_ptr &dhBa dCameraHostCallback_->OnCameraEvent(dCameraId, CameraEvent::CAMERA_EVENT_DEVICE_RMV); } - DHLOGI("DCameraHost::RemoveDCameraDevice, remove dcamera device success, dCameraId: %s", GetAnonyString(dCameraId).c_str()); + DHLOGI("DCameraHost::RemoveDCameraDevice, remove dcamera device success, dCameraId: %s", + GetAnonyString(dCameraId).c_str()); return DCamRetCode::SUCCESS; } diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameracontrol/dcamera_source_controller.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameracontrol/dcamera_source_controller.cpp index 74d1fa5..47d5c3a 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameracontrol/dcamera_source_controller.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameracontrol/dcamera_source_controller.cpp @@ -150,8 +150,8 @@ int32_t DCameraSourceController::ChannelNeg(std::shared_ptr& GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return ret; } - DHLOGD("DCameraSourceController ChannelNeg devId: %s, dhId: %s channelNegCommand: %s", GetAnonyString(devId).c_str(), - GetAnonyString(dhId).c_str(), cmd.command_.c_str()); + DHLOGD("DCameraSourceController ChannelNeg devId: %s, dhId: %s channelNegCommand: %s", + GetAnonyString(devId).c_str(),GetAnonyString(dhId).c_str(), cmd.command_.c_str()); ret = camSinkSrv->ChannelNeg(dhId, jsonStr); if (ret != DCAMERA_OK) { DHLOGE("DCameraSourceController ChannelNeg rpc failed ret: %d, devId: %s, dhId: %s", ret,