From a429dff6a1d746c975faf9747d5d4940e2314e91 Mon Sep 17 00:00:00 2001 From: rwx1283129 Date: Thu, 28 Dec 2023 11:28:10 +0000 Subject: [PATCH 1/5] add the log of package name for sensor Signed-off-by: rwx1283129 Change-Id: I6b91b05ec1bf10ab77d696788240575e3e9dfe14 --- services/src/sensor_service.cpp | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/services/src/sensor_service.cpp b/services/src/sensor_service.cpp index 45ca8992..5e477c7a 100644 --- a/services/src/sensor_service.cpp +++ b/services/src/sensor_service.cpp @@ -229,8 +229,8 @@ bool SensorService::CheckSensorId(int32_t sensorId) } ErrCode SensorService::EnableSensor(int32_t sensorId, int64_t samplingPeriodNs, int64_t maxReportDelayNs) -{ - CALL_LOG_ENTER; +{ + SEN_HILOGI("sensorId:%{public}d, samplingPeriodNs:%{public}ld, maxReportDelayNs:%{public}ld", sensorId, samplingPeriodNs, maxReportDelayNs); if ((!CheckSensorId(sensorId)) || ((samplingPeriodNs != 0L) && ((maxReportDelayNs / samplingPeriodNs) > MAX_EVENT_COUNT))) { SEN_HILOGE("sensorId is invalid or maxReportDelayNs exceeded the maximum value"); @@ -281,7 +281,10 @@ ErrCode SensorService::EnableSensor(int32_t sensorId, int64_t samplingPeriodNs, ErrCode SensorService::DisableSensor(int32_t sensorId, int32_t pid) { - CALL_LOG_ENTER; + std::string packageName(""); + AccessTokenID tokenId = clientInfo_.GetTokenIdByPid(pid); + sensorManager_.GetPackageName(tokenId, packageName); + SEN_HILOGI("sensorId:%{public}d, packageName:%{public}s", sensorId, packageName.c_str()); if (!CheckSensorId(sensorId)) { SEN_HILOGE("sensorId is invalid"); return ERR_NO_INIT; @@ -310,7 +313,7 @@ ErrCode SensorService::DisableSensor(int32_t sensorId, int32_t pid) ErrCode SensorService::DisableSensor(int32_t sensorId) { - CALL_LOG_ENTER; + SEN_HILOGE("DisableSensor already started, sensorId:%{public}d", sensorId); return DisableSensor(sensorId, GetCallingPid()); } @@ -449,7 +452,10 @@ int32_t SensorService::Dump(int32_t fd, const std::vector &args) ErrCode SensorService::SuspendSensors(int32_t pid) { - CALL_LOG_ENTER; + std::string packageName(""); + AccessTokenID tokenId = clientInfo_.GetTokenIdByPid(pid); + sensorManager_.GetPackageName(tokenId, packageName); + SEN_HILOGI("packageName:%{public}s", packageName.c_str()); if (pid < 0) { SEN_HILOGE("Pid is invalid"); return CLIENT_PID_INVALID_ERR; @@ -459,7 +465,10 @@ ErrCode SensorService::SuspendSensors(int32_t pid) ErrCode SensorService::ResumeSensors(int32_t pid) { - CALL_LOG_ENTER; + std::string packageName(""); + AccessTokenID tokenId = clientInfo_.GetTokenIdByPid(pid); + sensorManager_.GetPackageName(tokenId, packageName); + SEN_HILOGI("packageName:%{public}s", packageName.c_str()); if (pid < 0) { SEN_HILOGE("Pid is invalid"); return CLIENT_PID_INVALID_ERR; @@ -469,7 +478,10 @@ ErrCode SensorService::ResumeSensors(int32_t pid) ErrCode SensorService::GetActiveInfoList(int32_t pid, std::vector &activeInfoList) { - CALL_LOG_ENTER; + std::string packageName(""); + AccessTokenID tokenId = clientInfo_.GetTokenIdByPid(pid); + sensorManager_.GetPackageName(tokenId, packageName); + SEN_HILOGI("packageName:%{public}s", packageName.c_str()); if (pid < 0) { SEN_HILOGE("Pid is invalid"); return CLIENT_PID_INVALID_ERR; -- Gitee From b875d9ab55f3743793f720100bcfd852a157b66f Mon Sep 17 00:00:00 2001 From: rwx1283129 Date: Thu, 28 Dec 2023 11:37:36 +0000 Subject: [PATCH 2/5] Solve the defect Signed-off-by: rwx1283129 Change-Id: I01f31e565d335e403cab3abc62c9ea97098285d6 --- services/src/sensor_service.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/services/src/sensor_service.cpp b/services/src/sensor_service.cpp index 5e477c7a..50b2b23e 100644 --- a/services/src/sensor_service.cpp +++ b/services/src/sensor_service.cpp @@ -229,8 +229,9 @@ bool SensorService::CheckSensorId(int32_t sensorId) } ErrCode SensorService::EnableSensor(int32_t sensorId, int64_t samplingPeriodNs, int64_t maxReportDelayNs) -{ - SEN_HILOGI("sensorId:%{public}d, samplingPeriodNs:%{public}ld, maxReportDelayNs:%{public}ld", sensorId, samplingPeriodNs, maxReportDelayNs); +{ + SEN_HILOGI("sensorId:%{public}d, samplingPeriodNs:%{public}ld, maxReportDelayNs:%{public}ld", + sensorId, samplingPeriodNs, maxReportDelayNs); if ((!CheckSensorId(sensorId)) || ((samplingPeriodNs != 0L) && ((maxReportDelayNs / samplingPeriodNs) > MAX_EVENT_COUNT))) { SEN_HILOGE("sensorId is invalid or maxReportDelayNs exceeded the maximum value"); @@ -283,7 +284,7 @@ ErrCode SensorService::DisableSensor(int32_t sensorId, int32_t pid) { std::string packageName(""); AccessTokenID tokenId = clientInfo_.GetTokenIdByPid(pid); - sensorManager_.GetPackageName(tokenId, packageName); + sensorManager_.GetPackageName(tokenId, packageName); SEN_HILOGI("sensorId:%{public}d, packageName:%{public}s", sensorId, packageName.c_str()); if (!CheckSensorId(sensorId)) { SEN_HILOGE("sensorId is invalid"); @@ -454,7 +455,7 @@ ErrCode SensorService::SuspendSensors(int32_t pid) { std::string packageName(""); AccessTokenID tokenId = clientInfo_.GetTokenIdByPid(pid); - sensorManager_.GetPackageName(tokenId, packageName); + sensorManager_.GetPackageName(tokenId, packageName); SEN_HILOGI("packageName:%{public}s", packageName.c_str()); if (pid < 0) { SEN_HILOGE("Pid is invalid"); @@ -467,7 +468,7 @@ ErrCode SensorService::ResumeSensors(int32_t pid) { std::string packageName(""); AccessTokenID tokenId = clientInfo_.GetTokenIdByPid(pid); - sensorManager_.GetPackageName(tokenId, packageName); + sensorManager_.GetPackageName(tokenId, packageName); SEN_HILOGI("packageName:%{public}s", packageName.c_str()); if (pid < 0) { SEN_HILOGE("Pid is invalid"); @@ -480,7 +481,7 @@ ErrCode SensorService::GetActiveInfoList(int32_t pid, std::vector &a { std::string packageName(""); AccessTokenID tokenId = clientInfo_.GetTokenIdByPid(pid); - sensorManager_.GetPackageName(tokenId, packageName); + sensorManager_.GetPackageName(tokenId, packageName); SEN_HILOGI("packageName:%{public}s", packageName.c_str()); if (pid < 0) { SEN_HILOGE("Pid is invalid"); -- Gitee From 0be198249be6e70274c254a05fbd43b70ac56170 Mon Sep 17 00:00:00 2001 From: rwx1283129 Date: Thu, 28 Dec 2023 11:39:35 +0000 Subject: [PATCH 3/5] Solve the defect Signed-off-by: rwx1283129 Change-Id: I04580aa1e3d810a9be0706e8dcdc0f51bbcc780c --- services/src/sensor_service.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/src/sensor_service.cpp b/services/src/sensor_service.cpp index 50b2b23e..d90da460 100644 --- a/services/src/sensor_service.cpp +++ b/services/src/sensor_service.cpp @@ -230,7 +230,7 @@ bool SensorService::CheckSensorId(int32_t sensorId) ErrCode SensorService::EnableSensor(int32_t sensorId, int64_t samplingPeriodNs, int64_t maxReportDelayNs) { - SEN_HILOGI("sensorId:%{public}d, samplingPeriodNs:%{public}ld, maxReportDelayNs:%{public}ld", + SEN_HILOGI("sensorId:%{public}d, samplingPeriodNs:%{public}lld, maxReportDelayNs:%{public}lld", sensorId, samplingPeriodNs, maxReportDelayNs); if ((!CheckSensorId(sensorId)) || ((samplingPeriodNs != 0L) && ((maxReportDelayNs / samplingPeriodNs) > MAX_EVENT_COUNT))) { -- Gitee From 4f04cfb713077a115a1319c7b981132ff780453a Mon Sep 17 00:00:00 2001 From: rwx1283129 Date: Thu, 28 Dec 2023 11:44:15 +0000 Subject: [PATCH 4/5] Solve the defect Signed-off-by: rwx1283129 Change-Id: I783e86f3037cda7d9cefbff1a4220ecca7e2bf4b --- services/src/sensor_service.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/src/sensor_service.cpp b/services/src/sensor_service.cpp index d90da460..ae534924 100644 --- a/services/src/sensor_service.cpp +++ b/services/src/sensor_service.cpp @@ -231,7 +231,7 @@ bool SensorService::CheckSensorId(int32_t sensorId) ErrCode SensorService::EnableSensor(int32_t sensorId, int64_t samplingPeriodNs, int64_t maxReportDelayNs) { SEN_HILOGI("sensorId:%{public}d, samplingPeriodNs:%{public}lld, maxReportDelayNs:%{public}lld", - sensorId, samplingPeriodNs, maxReportDelayNs); + sensorId, samplingPeriodNs, maxReportDelayNs); if ((!CheckSensorId(sensorId)) || ((samplingPeriodNs != 0L) && ((maxReportDelayNs / samplingPeriodNs) > MAX_EVENT_COUNT))) { SEN_HILOGE("sensorId is invalid or maxReportDelayNs exceeded the maximum value"); -- Gitee From 3cf213cf33476caf40fae08bc82793e9be435b99 Mon Sep 17 00:00:00 2001 From: rwx1283129 Date: Fri, 5 Jan 2024 08:00:25 +0000 Subject: [PATCH 5/5] exchange the advice Signed-off-by: rwx1283129 Change-Id: I1f6ba8860f0646b7570b79b4e45ea0e1bb25e67f --- services/src/sensor_service.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/services/src/sensor_service.cpp b/services/src/sensor_service.cpp index ae534924..a802e02d 100644 --- a/services/src/sensor_service.cpp +++ b/services/src/sensor_service.cpp @@ -157,7 +157,7 @@ void SensorService::OnStop() void SensorService::ReportSensorSysEvent(int32_t sensorId, bool enable, int32_t pid) { - std::string packageName(""); + std::string packageName; AccessTokenID tokenId = clientInfo_.GetTokenIdByPid(pid); sensorManager_.GetPackageName(tokenId, packageName); const int logLevel = 4; @@ -282,7 +282,7 @@ ErrCode SensorService::EnableSensor(int32_t sensorId, int64_t samplingPeriodNs, ErrCode SensorService::DisableSensor(int32_t sensorId, int32_t pid) { - std::string packageName(""); + std::string packageName; AccessTokenID tokenId = clientInfo_.GetTokenIdByPid(pid); sensorManager_.GetPackageName(tokenId, packageName); SEN_HILOGI("sensorId:%{public}d, packageName:%{public}s", sensorId, packageName.c_str()); @@ -314,7 +314,7 @@ ErrCode SensorService::DisableSensor(int32_t sensorId, int32_t pid) ErrCode SensorService::DisableSensor(int32_t sensorId) { - SEN_HILOGE("DisableSensor already started, sensorId:%{public}d", sensorId); + CALL_LOG_ENTER; return DisableSensor(sensorId, GetCallingPid()); } @@ -453,7 +453,7 @@ int32_t SensorService::Dump(int32_t fd, const std::vector &args) ErrCode SensorService::SuspendSensors(int32_t pid) { - std::string packageName(""); + std::string packageName; AccessTokenID tokenId = clientInfo_.GetTokenIdByPid(pid); sensorManager_.GetPackageName(tokenId, packageName); SEN_HILOGI("packageName:%{public}s", packageName.c_str()); @@ -466,7 +466,7 @@ ErrCode SensorService::SuspendSensors(int32_t pid) ErrCode SensorService::ResumeSensors(int32_t pid) { - std::string packageName(""); + std::string packageName; AccessTokenID tokenId = clientInfo_.GetTokenIdByPid(pid); sensorManager_.GetPackageName(tokenId, packageName); SEN_HILOGI("packageName:%{public}s", packageName.c_str()); @@ -479,7 +479,7 @@ ErrCode SensorService::ResumeSensors(int32_t pid) ErrCode SensorService::GetActiveInfoList(int32_t pid, std::vector &activeInfoList) { - std::string packageName(""); + std::string packageName; AccessTokenID tokenId = clientInfo_.GetTokenIdByPid(pid); sensorManager_.GetPackageName(tokenId, packageName); SEN_HILOGI("packageName:%{public}s", packageName.c_str()); -- Gitee