diff --git a/services/accesstokenmanager/main/cpp/src/permission/temp_permission_observer.cpp b/services/accesstokenmanager/main/cpp/src/permission/temp_permission_observer.cpp index 915d62094a2d45b66d9e82886106c19d03ba8217..bcce7368dcc94bd7bc67c4a30b3373ab901e0024 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/temp_permission_observer.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/temp_permission_observer.cpp @@ -166,7 +166,7 @@ void PermissionBackgroundTaskObserver::OnContinuousTaskStart( std::vector typeIds = continuousTaskCallbackInfo->GetTypeIds(); auto it = std::find(typeIds.begin(), typeIds.end(), static_cast(BackgroundMode::LOCATION)); if (it == typeIds.end()) { - LOGD(ATM_DOMAIN, ATM_TAG, "TypeId can not use temp permission"); + LOGI(ATM_DOMAIN, ATM_TAG, "TypeId can not use temp permission"); return; } std::vector list; @@ -188,7 +188,7 @@ void PermissionBackgroundTaskObserver::OnContinuousTaskStop( std::vector typeIds = continuousTaskCallbackInfo->GetTypeIds(); auto it = std::find(typeIds.begin(), typeIds.end(), static_cast(BackgroundMode::LOCATION)); if (it == typeIds.end()) { - LOGD(ATM_DOMAIN, ATM_TAG, "TypeId can not use temp permission"); + LOGI(ATM_DOMAIN, ATM_TAG, "TypeId can not use temp permission"); return; } std::vector list; diff --git a/services/accesstokenmanager/test/mock/library_loader_mock.cpp b/services/accesstokenmanager/test/mock/library_loader_mock.cpp index 5d5275cd51bea9d56d9e53b40c1525b7d64f8e1c..692d976d36c886b2a117ab87b1a1e34c7c92efe5 100644 --- a/services/accesstokenmanager/test/mock/library_loader_mock.cpp +++ b/services/accesstokenmanager/test/mock/library_loader_mock.cpp @@ -53,10 +53,8 @@ LibraryLoader::LibraryLoader(const std::string& path) LibraryLoader::~LibraryLoader() {} -bool LibraryLoader::PrintErrorLog(const std::string& targetName) -{ - return true; -} +void LibraryLoader::PrintErrorLog(const std::string& targetName) +{} void LibraryLoader::Create() {} diff --git a/services/common/libraryloader/include/libraryloader.h b/services/common/libraryloader/include/libraryloader.h index 3cda5baafde283be8fdbc6d2887f5db9b0597604..a26f8bcf6f8135faf1d23f7344cfc39cda39aeca 100644 --- a/services/common/libraryloader/include/libraryloader.h +++ b/services/common/libraryloader/include/libraryloader.h @@ -36,7 +36,7 @@ private: void* instance_ = nullptr; void Create(); void Destroy(); - bool PrintErrorLog(const std::string& targetName); + void PrintErrorLog(const std::string& targetName); }; } // AccessToken } // Security diff --git a/services/common/libraryloader/src/libraryloader.cpp b/services/common/libraryloader/src/libraryloader.cpp index c9d53569622feadac9802cc7f93ece646f51c277..21d930a34c39904af757c319477f0557372136d1 100644 --- a/services/common/libraryloader/src/libraryloader.cpp +++ b/services/common/libraryloader/src/libraryloader.cpp @@ -51,21 +51,19 @@ LibraryLoader::~LibraryLoader() #endif // FUZZ_ENABLE } -bool LibraryLoader::PrintErrorLog(const std::string& targetName) +void LibraryLoader::PrintErrorLog(const std::string& targetName) { char* error; if ((error = dlerror()) != nullptr) { - LOGE(ATM_DOMAIN, ATM_TAG, "Get %{public}s failed, errMsg=%{public}s.", - targetName.c_str(), error); - return false; + LOGE(ATM_DOMAIN, ATM_TAG, "Get %{public}s failed, errMsg=%{public}s.", targetName.c_str(), error); } - return true; } void LibraryLoader::Create() { void* (*create)(void) = reinterpret_cast(dlsym(handle_, "Create")); - if (!PrintErrorLog("Create")) { + if (create == nullptr) { + PrintErrorLog("Create"); return; } instance_ = create(); @@ -74,7 +72,8 @@ void LibraryLoader::Create() void LibraryLoader::Destroy() { void (*destroy)(void*) = reinterpret_cast(dlsym(handle_, "Destroy")); - if (!PrintErrorLog("Destroy")) { + if (destroy == nullptr) { + PrintErrorLog("Destroy"); return; } destroy(instance_);