diff --git a/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_controller.h b/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_controller.h index 441b12eaedb83711b6a9ea16a4148549f10de6ef..c43050c36ca09df7344e1baa0a6d75915a16ee81 100644 --- a/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_controller.h +++ b/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_controller.h @@ -81,7 +81,6 @@ private: int32_t GetDeviceSecurityLevel(const std::string &udid); std::string GetUdidByNetworkId(const std::string &networkId); int32_t PullUpPage(); - bool CheckPermission(); void ProcessFrameTrigger(const AppExecFwk::InnerEvent::Pointer &event); void ProcessPostAuthorization(const AppExecFwk::InnerEvent::Pointer &event); int32_t CreateCtrlSession(); diff --git a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp index 09b9e7b8aba7d673c0a52d96781c589c3ec689a3..2f89cf0bbf251772372bb0dc2670a096c3ee4d55 100644 --- a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp +++ b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp @@ -192,10 +192,6 @@ int32_t DCameraSinkController::DCameraNotify(std::shared_ptr& even int32_t DCameraSinkController::UpdateSettings(std::vector>& settings) { DHLOGI("UpdateSettings dhId: %{public}s", GetAnonyString(dhId_).c_str()); - if (!CheckPermission()) { - DHLOGE("DCameraSinkController UpdateSettings fail, CheckPermission fail"); - return DCAMERA_WRONG_STATE; - } int32_t ret = operator_->UpdateSettings(settings); if (ret != DCAMERA_OK) { DHLOGE("UpdateSettings failed, dhId: %{public}s, ret: %{public}d", GetAnonyString(dhId_).c_str(), ret); @@ -244,10 +240,6 @@ int32_t DCameraSinkController::OpenChannel(std::shared_ptr& ope { DHLOGI("DCameraSinkController OpenChannel Start, dhId: %{public}s", GetAnonyString(dhId_).c_str()); ManageSelectChannel::GetInstance().SetSinkConnect(false); - if (!CheckPermission()) { - DHLOGE("DCameraSinkController OpenChannel fail, CheckPermission fail"); - return DCAMERA_WRONG_STATE; - } if (sessionState_ != DCAMERA_CHANNEL_STATE_DISCONNECTED) { DHLOGE("wrong state, dhId: %{public}s, sessionState: %{public}d", GetAnonyString(dhId_).c_str(), sessionState_); return DCAMERA_WRONG_STATE; @@ -874,13 +866,6 @@ std::string DCameraSinkController::GetUdidByNetworkId(const std::string &network return udid; } -bool DCameraSinkController::CheckPermission() -{ - DHLOGI("DCameraSinkController CheckPermission Start"); - auto uid = IPCSkeleton::GetCallingUid(); - return uid == DCAMERA_UID; -} - void DCameraSinkController::SetTokenId(uint64_t token) { sinkTokenId_ = token;