From 89595d30240e84b09bdbe2fa83752e317ba43236 Mon Sep 17 00:00:00 2001 From: liulinna Date: Tue, 22 Mar 2022 11:32:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E8=B0=83=E6=95=B4=E5=A4=B4=E6=96=87=E4=BB=B61?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: guduhanyan --- etc/init/timeservice.cfg | 2 +- interfaces/kits/js/napi/system_time/src/js_systemtime.cpp | 4 ++-- utils/native/src/time_permission.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/init/timeservice.cfg b/etc/init/timeservice.cfg index 415dc9c..53a0332 100644 --- a/etc/init/timeservice.cfg +++ b/etc/init/timeservice.cfg @@ -4,7 +4,7 @@ "path" : ["/system/bin/sa_main", "/system/profile/time_service.xml"], "uid" : "system", "gid" : ["system", "shell"], - "caps" : ["SYS_TIME", "WAKE_ALARM"] + "caps" : ["CAP_SYS_TIME", "WAKE_ALARM"] } ] } diff --git a/interfaces/kits/js/napi/system_time/src/js_systemtime.cpp b/interfaces/kits/js/napi/system_time/src/js_systemtime.cpp index 0977159..40cee76 100644 --- a/interfaces/kits/js/napi/system_time/src/js_systemtime.cpp +++ b/interfaces/kits/js/napi/system_time/src/js_systemtime.cpp @@ -204,8 +204,8 @@ napi_value ParseParametersBySetTimezone(const napi_env &env, const napi_value (& char timeZoneChars[MAX_TIME_ZONE_ID]; size_t copied; napi_get_value_string_utf8(env, argv[0], timeZoneChars, MAX_TIME_ZONE_ID - 1, &copied); - NAPI_ASSERT(env, copied == 0, "Wrong argument timezone. timezoneid length >0 expected."); - timezoneId.assign(timeZoneChars, copied); + + timezoneId = std::string(timeZoneChars); // argv[1]:callback if (argc >= SET_TIMEZONE_MAX_PARA) { diff --git a/utils/native/src/time_permission.cpp b/utils/native/src/time_permission.cpp index 51dfe8f..c760b31 100644 --- a/utils/native/src/time_permission.cpp +++ b/utils/native/src/time_permission.cpp @@ -38,7 +38,7 @@ bool TimePermission::CheckSelfPermission(std::string permName) bool TimePermission::CheckCallingPermission(int32_t uid, std::string permName) { if ((uid == SYSTEM_UID) || (uid == TEST_UID)) { - TIME_HILOGD(TIME_MODULE_COMMON, "root uid return true"); + TIME_HILOGD(TIME_MODULE_COMMON, "system uid return true"); return true; } if (IsSystemUid(uid)) {