diff --git a/frameworks/native/sensor/src/sensor_agent_proxy.cpp b/frameworks/native/sensor/src/sensor_agent_proxy.cpp index ce29e2f1354607ca81848b8d6f485878851fab54..db6c862556ff4187b76638ab1f5ed59acd1d2191 100755 --- a/frameworks/native/sensor/src/sensor_agent_proxy.cpp +++ b/frameworks/native/sensor/src/sensor_agent_proxy.cpp @@ -343,8 +343,8 @@ int32_t SensorAgentProxy::GetAllSensors(SensorInfo **sensorInfo, int32_t *count) HiLog::Error(LABEL, "%{public}s strcpy vendorName failed", __func__); return OHOS::Sensors::ERROR; } - const char *version = std::to_string(sensorList_[index].GetVersion()).c_str(); - ret = strcpy_s((*sensorInfo + index)->hardwareVersion, VERSION_MAX_LEN, version); + std::string version = std::to_string(sensorList_[index].GetVersion()); + ret = strcpy_s((*sensorInfo + index)->hardwareVersion, VERSION_MAX_LEN, version.c_str()); if (ret != EOK) { HiLog::Error(LABEL, "%{public}s strcpy hardwareVersion failed", __func__); return OHOS::Sensors::ERROR; diff --git a/utils/include/permission_util.h b/utils/include/permission_util.h index 4a5721a216aa9c60f0cca4121243ac91485e4854..a68658c61f06c555431101620b8aa03c842508f6 100644 --- a/utils/include/permission_util.h +++ b/utils/include/permission_util.h @@ -16,11 +16,9 @@ #ifndef PERMISSION_UTIL_H #define PERMISSION_UTIL_H -#include #include #include #include "accesstoken_kit.h" -#include "refbase.h" #include "singleton.h" namespace OHOS { diff --git a/utils/src/permission_util.cpp b/utils/src/permission_util.cpp index 92a4bd45f029c43f7fdb5b333ec1a90cb5aa7a26..3bdf81c63884cc29692d7b33d383131c32574eee 100644 --- a/utils/src/permission_util.cpp +++ b/utils/src/permission_util.cpp @@ -50,7 +50,7 @@ bool PermissionUtil::CheckSensorPermission(AccessTokenID callerToken, int32_t se } std::string permissionName = sensorPermissions_[sensorTypeId]; int32_t result = AccessTokenKit::VerifyAccessToken(callerToken, permissionName); - if (result == PERMISSION_GRANTED) { + if (result != PERMISSION_GRANTED) { HiLog::Error(LABEL, "%{public}s sensorId: %{public}d grant failed, result: %{public}d", __func__, sensorTypeId, result); return false;