diff --git a/services/common/json_parse/src/json_parse_loader.cpp b/services/common/json_parse/src/json_parse_loader.cpp index 76a51844d41a798718c806f26c50239cf0b5d119..ab137001b395b5371b789de278d4c76a8200d6e6 100644 --- a/services/common/json_parse/src/json_parse_loader.cpp +++ b/services/common/json_parse/src/json_parse_loader.cpp @@ -298,7 +298,7 @@ static ATokenTypeEnum GetTokenIdTypeEnum(AccessTokenID id) return static_cast(idInner->type); } -static void GetSingleNativeTokenFromJson(const CJson* j, NativeTokenInfoBase& native) +static void GetSingleNativeTokenFromJson(const CJson* j, std::vector& tokenInfos) { NativeTokenInfoBase info; int32_t aplNum = 0; @@ -345,10 +345,10 @@ static void GetSingleNativeTokenFromJson(const CJson* j, NativeTokenInfoBase& n } if (!GetStringFromJson(j, JSON_PROCESS_NAME, info.processName) || - !DataValidator::IsProcessNameValid(info.processName)) { + !DataValidator::IsProcessNameValid(info.processName) || info.processName.empty()) { return; } - native = info; + tokenInfos.emplace_back(info); } bool ConfigPolicLoader::ParserNativeRawData( @@ -362,11 +362,7 @@ bool ConfigPolicLoader::ParserNativeRawData( int32_t len = cJSON_GetArraySize(jsonRes.get()); for (int32_t i = 0; i < len; i++) { CJson* item = cJSON_GetArrayItem(jsonRes.get(), i); - NativeTokenInfoBase token; - GetSingleNativeTokenFromJson(item, token); - if (!token.processName.empty()) { - tokenInfos.emplace_back(token); - } + GetSingleNativeTokenFromJson(item, tokenInfos); } return true; } diff --git a/services/tokensyncmanager/src/remote/soft_bus_manager.cpp b/services/tokensyncmanager/src/remote/soft_bus_manager.cpp index 3f6cdf622a4ffeea4ab79b07f01521c600d40cef..fefbb34c690b2f8b3180b59128dec68101a045b8 100644 --- a/services/tokensyncmanager/src/remote/soft_bus_manager.cpp +++ b/services/tokensyncmanager/src/remote/soft_bus_manager.cpp @@ -558,7 +558,6 @@ std::string SoftBusManager::ConvertToUniqueDeviceIdOrFetch(const std::string& no { bool isFoundDevice = false; std::string uniqueDeviceId = DeviceInfoManager::GetInstance().ConvertToUniqueDeviceId(nodeId, isFoundDevice); - LOGE(ATM_DOMAIN, ATM_TAG, "nodeId %{public}d", isFoundDevice); if (uniqueDeviceId.empty() && isFoundDevice) { std::string udid = GetUniqueDeviceIdByNodeId(nodeId); if (!udid.empty()) {