From cd9266232fba5e4cbbfd340471ac7ff169857cf0 Mon Sep 17 00:00:00 2001 From: libo429 Date: Thu, 31 Jul 2025 11:07:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=90=88=E7=90=86ERROR=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: libo429 --- .../src/notify/device_manager_notify.cpp | 24 ------------------- utils/src/appInfo/standard/app_manager.cpp | 1 - 2 files changed, 25 deletions(-) diff --git a/interfaces/inner_kits/native_cpp/src/notify/device_manager_notify.cpp b/interfaces/inner_kits/native_cpp/src/notify/device_manager_notify.cpp index c381afc67..9b4674a10 100644 --- a/interfaces/inner_kits/native_cpp/src/notify/device_manager_notify.cpp +++ b/interfaces/inner_kits/native_cpp/src/notify/device_manager_notify.cpp @@ -320,9 +320,6 @@ void DeviceManagerNotify::OnDeviceOnline(const std::string &pkgName, const DmDev std::lock_guard autoLock(lock_); auto iter = deviceStateCallback_.find(pkgName); if (iter == deviceStateCallback_.end()) { - if (deviceStatusCallback_.find(pkgName) == deviceStatusCallback_.end()) { - LOGE("OnDeviceOnline error, device state callback not register."); - } return; } tempCbk = iter->second; @@ -353,9 +350,6 @@ void DeviceManagerNotify::OnDeviceOnline(const std::string &pkgName, const DmDev std::lock_guard autoLock(lock_); auto iter = deviceStatusCallback_.find(pkgName); if (iter == deviceStatusCallback_.end()) { - if (deviceStateCallback_.find(pkgName) == deviceStateCallback_.end()) { - LOGE("Error, device status callback not register."); - } return; } tempCbk = iter->second; @@ -386,9 +380,6 @@ void DeviceManagerNotify::OnDeviceOffline(const std::string &pkgName, const DmDe std::lock_guard autoLock(lock_); auto iter = deviceStateCallback_.find(pkgName); if (iter == deviceStateCallback_.end()) { - if (deviceStatusCallback_.find(pkgName) == deviceStatusCallback_.end()) { - LOGE("Error, device state callback not register."); - } return; } tempCbk = iter->second; @@ -420,9 +411,6 @@ void DeviceManagerNotify::OnDeviceOffline(const std::string &pkgName, const DmDe std::lock_guard autoLock(lock_); auto iter = deviceStatusCallback_.find(pkgName); if (iter == deviceStatusCallback_.end()) { - if (deviceStateCallback_.find(pkgName) == deviceStateCallback_.end()) { - LOGE("Error, device status callback not register."); - } return; } tempCbk = iter->second; @@ -454,9 +442,6 @@ void DeviceManagerNotify::OnDeviceChanged(const std::string &pkgName, const DmDe std::lock_guard autoLock(lock_); auto iter = deviceStateCallback_.find(pkgName); if (iter == deviceStateCallback_.end()) { - if (deviceStatusCallback_.find(pkgName) == deviceStatusCallback_.end()) { - LOGE("error, device state callback not register, pkgName:%{public}s",pkgName.c_str()); - } return; } tempCbk = iter->second; @@ -488,9 +473,6 @@ void DeviceManagerNotify::OnDeviceChanged(const std::string &pkgName, const DmDe std::lock_guard autoLock(lock_); auto iter = deviceStatusCallback_.find(pkgName); if (iter == deviceStatusCallback_.end()) { - if (deviceStateCallback_.find(pkgName) == deviceStateCallback_.end()) { - LOGE("error, device state callback not register, pkgName:%{public}s", pkgName.c_str()); - } return; } tempCbk = iter->second; @@ -522,9 +504,6 @@ void DeviceManagerNotify::OnDeviceReady(const std::string &pkgName, const DmDevi std::lock_guard autoLock(lock_); auto iter = deviceStateCallback_.find(pkgName); if (iter == deviceStateCallback_.end()) { - if (deviceStatusCallback_.find(pkgName) == deviceStatusCallback_.end()) { - LOGE("error, device state callback not register, pkgName:%{public}s", pkgName.c_str()); - } return; } tempCbk = iter->second; @@ -555,9 +534,6 @@ void DeviceManagerNotify::OnDeviceReady(const std::string &pkgName, const DmDevi std::lock_guard autoLock(lock_); auto iter = deviceStatusCallback_.find(pkgName); if (iter == deviceStatusCallback_.end()) { - if (deviceStateCallback_.find(pkgName) != deviceStateCallback_.end()) { - LOGE("error, device status callback not register, pkgName:%{public}s", pkgName.c_str()); - } return; } tempCbk = iter->second; diff --git a/utils/src/appInfo/standard/app_manager.cpp b/utils/src/appInfo/standard/app_manager.cpp index b9537ca5f..87cf4883a 100644 --- a/utils/src/appInfo/standard/app_manager.cpp +++ b/utils/src/appInfo/standard/app_manager.cpp @@ -102,7 +102,6 @@ DM_EXPORT void AppManager::UnRegisterCallerAppId(const std::string &pkgName) LOGI("PkgName %{public}s.", pkgName.c_str()); std::lock_guard lock(appIdMapLock_); if (appIdMap_.find(pkgName) == appIdMap_.end()) { - LOGE("AppIdMap not find pkgName."); return; } appIdMap_.erase(pkgName); -- Gitee