From b90b300e28dcd6b9f89cda1c4e4ea02a1b4e26a4 Mon Sep 17 00:00:00 2001 From: 30059993 Date: Wed, 4 Jun 2025 10:29:45 +0800 Subject: [PATCH] =?UTF-8?q?get=E6=8E=A5=E5=8F=A3=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 30059993 --- interfaces/kits/napi/src/js_ui_appearance.cpp | 21 +++---------------- services/src/ui_appearance_ability.cpp | 20 ------------------ 2 files changed, 3 insertions(+), 38 deletions(-) diff --git a/interfaces/kits/napi/src/js_ui_appearance.cpp b/interfaces/kits/napi/src/js_ui_appearance.cpp index 26ac9e5..5f8404c 100644 --- a/interfaces/kits/napi/src/js_ui_appearance.cpp +++ b/interfaces/kits/napi/src/js_ui_appearance.cpp @@ -323,12 +323,7 @@ static napi_value JSGetDarkMode(napi_env env, napi_callback_info info) NapiThrow(env, "get dark-mode failed.", UiAppearanceAbilityErrCode::SYS_ERR); return result; } - if (mode == UiAppearanceAbilityErrCode::PERMISSION_ERR) { - NapiThrow(env, - "An attempt was made to get configuration forbidden by permission: ohos.permission.UPDATE_CONFIGURATION.", - UiAppearanceAbilityErrCode::PERMISSION_ERR); - return result; - } + NAPI_CALL(env, napi_create_int32(env, mode, &result)); return result; } @@ -351,12 +346,7 @@ static napi_value JSGetFontScale(napi_env env, napi_callback_info info) NapiThrow(env, "get font-scale failed.", UiAppearanceAbilityErrCode::SYS_ERR); return result; } - if (ret == UiAppearanceAbilityErrCode::PERMISSION_ERR) { - NapiThrow(env, - "An attempt was made to get configuration forbidden by permission: ohos.permission.UPDATE_CONFIGURATION.", - UiAppearanceAbilityErrCode::PERMISSION_ERR); - return result; - } + double fontScaleNumber = std::stod(fontScale); NAPI_CALL(env, napi_create_double(env, fontScaleNumber, &result)); return result; @@ -424,12 +414,7 @@ static napi_value JSGetFontWeightScale(napi_env env, napi_callback_info info) NapiThrow(env, "get font-Weight-scale failed.", UiAppearanceAbilityErrCode::SYS_ERR); return result; } - if (ret == UiAppearanceAbilityErrCode::PERMISSION_ERR) { - NapiThrow(env, - "An attempt was made to get configuration forbidden by permission: ohos.permission.UPDATE_CONFIGURATION.", - UiAppearanceAbilityErrCode::PERMISSION_ERR); - return result; - } + double fontWeightScaleNumber = std::stod(fontWeightScale); NAPI_CALL(env, napi_create_double(env, fontWeightScaleNumber, &result)); return result; diff --git a/services/src/ui_appearance_ability.cpp b/services/src/ui_appearance_ability.cpp index 2301302..04e0acd 100644 --- a/services/src/ui_appearance_ability.cpp +++ b/services/src/ui_appearance_ability.cpp @@ -583,13 +583,6 @@ DarkMode UiAppearanceAbility::InitGetDarkMode(const int32_t userId) ErrCode UiAppearanceAbility::GetDarkMode(int32_t& funcResult) { - auto isCallingPerm = VerifyAccessToken(PERMISSION_UPDATE_CONFIGURATION); - if (!isCallingPerm) { - LOGE("permission verification failed"); - funcResult = PERMISSION_ERR; - return funcResult; - } - { std::lock_guard guard(usersParamMutex_); auto it = usersParam_.find(GetCallingUserId()); @@ -652,12 +645,6 @@ ErrCode UiAppearanceAbility::SetFontScale(const std::string& fontScale, int32_t& ErrCode UiAppearanceAbility::GetFontScale(std::string& fontScale, int32_t& funcResult) { - auto isCallingPerm = VerifyAccessToken(PERMISSION_UPDATE_CONFIGURATION); - if (!isCallingPerm) { - LOGE("permission verification failed"); - funcResult = PERMISSION_ERR; - return funcResult; - } { std::lock_guard guard(usersParamMutex_); auto it = usersParam_.find(GetCallingUserId()); @@ -723,13 +710,6 @@ ErrCode UiAppearanceAbility::SetFontWeightScale(const std::string& fontWeightSca ErrCode UiAppearanceAbility::GetFontWeightScale(std::string& fontWeightScale, int32_t& funcResult) { - auto isCallingPerm = VerifyAccessToken(PERMISSION_UPDATE_CONFIGURATION); - if (!isCallingPerm) { - LOGE("permission verification failed"); - funcResult = PERMISSION_ERR; - return funcResult; - } - { std::lock_guard guard(usersParamMutex_); auto it = usersParam_.find(GetCallingUserId());