diff --git a/frameworks/ets/ani/accesstoken/src/ani_ability_access_ctrl.cpp b/frameworks/ets/ani/accesstoken/src/ani_ability_access_ctrl.cpp index 407d42c8939b327f6b0e34e7aa32f69dd4b1832d..bb1f4841dbae9aff48c01fec052a6e20ad447f54 100644 --- a/frameworks/ets/ani/accesstoken/src/ani_ability_access_ctrl.cpp +++ b/frameworks/ets/ani/accesstoken/src/ani_ability_access_ctrl.cpp @@ -281,7 +281,7 @@ static ani_int CheckAccessTokenExecute([[maybe_unused]] ani_env* env, [[maybe_un } AccessTokenID tokenID = static_cast(aniTokenID); std::string permissionName = ParseAniString(env, static_cast(aniPermission)); - if ((!BusinessErrorAni::ValidateTokenIDdWithThrowError(env, tokenID)) || + if ((!BusinessErrorAni::ValidateTokenIDWithThrowError(env, tokenID)) || (!BusinessErrorAni::ValidatePermissionWithThrowError(env, permissionName))) { LOGE(ATM_DOMAIN, ATM_TAG, "TokenId(%{public}u) or Permission(%{public}s) is invalid.", tokenID, permissionName.c_str()); @@ -323,7 +323,7 @@ static void GrantUserGrantedPermissionExecute([[maybe_unused]] ani_env *env, [[m AccessTokenID tokenID = static_cast(aniTokenID); std::string permissionName = ParseAniString(env, static_cast(aniPermission)); uint32_t permissionFlags = static_cast(aniFlags); - if ((!BusinessErrorAni::ValidateTokenIDdWithThrowError(env, tokenID)) || + if ((!BusinessErrorAni::ValidateTokenIDWithThrowError(env, tokenID)) || (!BusinessErrorAni::ValidatePermissionWithThrowError(env, permissionName)) || (!BusinessErrorAni::ValidatePermissionFlagWithThrowError(env, permissionFlags))) { LOGE(ATM_DOMAIN, ATM_TAG, "TokenId(%{public}u) or Permission(%{public}s) or flags(%{public}u)is invalid.", @@ -357,7 +357,7 @@ static void RevokeUserGrantedPermissionExecute([[maybe_unused]] ani_env* env, AccessTokenID tokenID = static_cast(aniTokenID); std::string permissionName = ParseAniString(env, static_cast(aniPermission)); uint32_t permissionFlags = static_cast(aniFlags); - if ((!BusinessErrorAni::ValidateTokenIDdWithThrowError(env, tokenID)) || + if ((!BusinessErrorAni::ValidateTokenIDWithThrowError(env, tokenID)) || (!BusinessErrorAni::ValidatePermissionWithThrowError(env, permissionName)) || (!BusinessErrorAni::ValidatePermissionFlagWithThrowError(env, permissionFlags))) { LOGE(ATM_DOMAIN, ATM_TAG, "TokenId(%{public}u) or Permission(%{public}s) or flags(%{public}u)is invalid.", @@ -407,7 +407,7 @@ static ani_ref GetPermissionsStatusExecute([[maybe_unused]] ani_env* env, return nullptr; } AccessTokenID tokenID = static_cast(aniTokenID); - if (!BusinessErrorAni::ValidateTokenIDdWithThrowError(env, tokenID)) { + if (!BusinessErrorAni::ValidateTokenIDWithThrowError(env, tokenID)) { LOGE(ATM_DOMAIN, ATM_TAG, "TokenId(%{public}u) is invalid.", tokenID); return nullptr; } @@ -446,7 +446,7 @@ static ani_int GetPermissionFlagsExecute([[maybe_unused]] ani_env* env, } AccessTokenID tokenID = static_cast(aniTokenID); std::string permissionName = ParseAniString(env, static_cast(aniPermissionName)); - if ((!BusinessErrorAni::ValidateTokenIDdWithThrowError(env, tokenID)) || + if ((!BusinessErrorAni::ValidateTokenIDWithThrowError(env, tokenID)) || (!BusinessErrorAni::ValidatePermissionWithThrowError(env, permissionName))) { LOGE(ATM_DOMAIN, ATM_TAG, "TokenId(%{public}u) or Permission(%{public}s) is invalid.", tokenID, permissionName.c_str()); diff --git a/frameworks/ets/ani/accesstoken/src/ani_request_global_switch_on_setting.cpp b/frameworks/ets/ani/accesstoken/src/ani_request_global_switch_on_setting.cpp index 1cdeeb14e0444caf04292bfab42340e5f69758ea..0292271185b5efdc3f66a070b97b643d34fec13b 100644 --- a/frameworks/ets/ani/accesstoken/src/ani_request_global_switch_on_setting.cpp +++ b/frameworks/ets/ani/accesstoken/src/ani_request_global_switch_on_setting.cpp @@ -32,7 +32,7 @@ const std::string EXTENSION_TYPE_KEY = "ability.want.params.uiExtensionType"; const std::string UI_EXTENSION_TYPE = "sys/commonUI"; // error code from dialog -constexpr int32_t REQUEST_REALDY_EXIST = 1; +constexpr int32_t REQUEST_ALREADY_EXIST = 1; constexpr int32_t GLOBAL_TYPE_IS_NOT_SUPPORT = 2; constexpr int32_t SWITCH_IS_ALREADY_OPEN = 3; } @@ -126,7 +126,7 @@ static int32_t TransferToStsErrorCode(int32_t errCode) case RET_SUCCESS: stsCode = STS_OK; break; - case REQUEST_REALDY_EXIST: + case REQUEST_ALREADY_EXIST: stsCode = STS_ERROR_REQUEST_IS_ALREADY_EXIST; break; case GLOBAL_TYPE_IS_NOT_SUPPORT: diff --git a/frameworks/ets/ani/accesstoken/src/ani_request_permission_on_setting.cpp b/frameworks/ets/ani/accesstoken/src/ani_request_permission_on_setting.cpp index e65856d87ea3b1bc746e6c988d0625ee1a138a96..2dd690dcd712d8b064ffb422cea9234e45adc748 100644 --- a/frameworks/ets/ani/accesstoken/src/ani_request_permission_on_setting.cpp +++ b/frameworks/ets/ani/accesstoken/src/ani_request_permission_on_setting.cpp @@ -25,7 +25,7 @@ std::map> RequestOnSettingAsyncInstanceControl::instanceIdMap_; std::mutex RequestOnSettingAsyncInstanceControl::instanceIdMutex_; namespace { -constexpr int32_t REQUEST_REALDY_EXIST = 1; +constexpr int32_t REQUEST_ALREADY_EXIST = 1; constexpr int32_t PERM_NOT_BELONG_TO_SAME_GROUP = 2; constexpr int32_t PERM_IS_NOT_DECLARE = 3; constexpr int32_t ALL_PERM_GRANTED = 4; @@ -182,7 +182,7 @@ static int32_t TransferToStsErrorCode(int32_t errorCode) case RET_SUCCESS: stsCode = STS_OK; break; - case REQUEST_REALDY_EXIST: + case REQUEST_ALREADY_EXIST: stsCode = STS_ERROR_REQUEST_IS_ALREADY_EXIST; break; case PERM_NOT_BELONG_TO_SAME_GROUP: diff --git a/frameworks/ets/ani/common/include/ani_error.h b/frameworks/ets/ani/common/include/ani_error.h index e47fe113372111c792d696a2f5c4493d246eada9..4e1f1b60bb97424a0ff77f1d0d78aac97cf2d932 100644 --- a/frameworks/ets/ani/common/include/ani_error.h +++ b/frameworks/ets/ani/common/include/ani_error.h @@ -60,7 +60,7 @@ public: static void ThrowParameterTypeError(ani_env* env, int32_t err, const std::string& errMsg); static void ThrowError(ani_env* env, int32_t err, const std::string& errMsg = ""); static int32_t GetStsErrorCode(int32_t errCode); - static bool ValidateTokenIDdWithThrowError(ani_env* env, AccessTokenID tokenID); + static bool ValidateTokenIDWithThrowError(ani_env* env, AccessTokenID tokenID); static bool ValidatePermissionWithThrowError(ani_env* env, const std::string& permission); static bool ValidatePermissionFlagWithThrowError(ani_env* env, uint32_t flag); diff --git a/frameworks/ets/ani/common/src/ani_error.cpp b/frameworks/ets/ani/common/src/ani_error.cpp index 92f9bd09186c3c312a26f561e8371c0d7fbf697d..ef1b95fcba71ba2b3a4b2016834210b0d47998ed 100644 --- a/frameworks/ets/ani/common/src/ani_error.cpp +++ b/frameworks/ets/ani/common/src/ani_error.cpp @@ -190,7 +190,7 @@ int32_t BusinessErrorAni::GetStsErrorCode(int32_t errCode) return stsCode; } -bool BusinessErrorAni::ValidateTokenIDdWithThrowError(ani_env* env, AccessTokenID tokenID) +bool BusinessErrorAni::ValidateTokenIDWithThrowError(ani_env* env, AccessTokenID tokenID) { if (!DataValidator::IsTokenIDValid(tokenID)) { std::string errMsg = GetErrorMessage(STS_ERROR_PARAM_INVALID, "The tokenID is 0."); diff --git a/frameworks/ets/ani/privacy/src/privacy_manager.cpp b/frameworks/ets/ani/privacy/src/privacy_manager.cpp index 50eff888147fefc976cf6325cb9bc2e7bb57bd79..fef3cdd49bdd76fa534b408c9da4da8b517dcd80 100644 --- a/frameworks/ets/ani/privacy/src/privacy_manager.cpp +++ b/frameworks/ets/ani/privacy/src/privacy_manager.cpp @@ -97,7 +97,7 @@ static void AddPermissionUsedRecordExecute([[maybe_unused]] ani_env* env, } AccessTokenID tokenID = static_cast(aniTokenID); std::string permission = ParseAniString(env, aniPermission); - if ((!BusinessErrorAni::ValidateTokenIDdWithThrowError(env, tokenID)) || + if ((!BusinessErrorAni::ValidateTokenIDWithThrowError(env, tokenID)) || (!BusinessErrorAni::ValidatePermissionWithThrowError(env, permission))) { LOGE(PRI_DOMAIN, PRI_TAG, "TokenId(%{public}u) or Permission(%{public}s) is invalid.", tokenID, permission.c_str()); @@ -477,7 +477,7 @@ static void StopUsingPermissionExecute( AccessTokenID tokenID = static_cast(aniTokenID); std::string permission = ParseAniString(env, aniPermission); - if ((!BusinessErrorAni::ValidateTokenIDdWithThrowError(env, tokenID)) || + if ((!BusinessErrorAni::ValidateTokenIDWithThrowError(env, tokenID)) || (!BusinessErrorAni::ValidatePermissionWithThrowError(env, permission))) { LOGE(PRI_DOMAIN, PRI_TAG, "TokenId(%{public}u) or Permission(%{public}s) is invalid.", tokenID, permission.c_str()); @@ -504,7 +504,7 @@ static void StartUsingPermissionExecute([[maybe_unused]] ani_env* env, } AccessTokenID tokenID = static_cast(aniTokenID); std::string permission = ParseAniString(env, aniPermission); - if ((!BusinessErrorAni::ValidateTokenIDdWithThrowError(env, tokenID)) || + if ((!BusinessErrorAni::ValidateTokenIDWithThrowError(env, tokenID)) || (!BusinessErrorAni::ValidatePermissionWithThrowError(env, permission))) { LOGE(PRI_DOMAIN, PRI_TAG, "TokenId(%{public}u) or Permission(%{public}s) is invalid.", tokenID, permission.c_str()); diff --git a/frameworks/js/napi/accesstoken/src/napi_request_global_switch_on_setting.cpp b/frameworks/js/napi/accesstoken/src/napi_request_global_switch_on_setting.cpp index 981c13fb29987495dc425922d885a5c93e1568b1..31a850cbf563c3a6faaf92b0f83e765cb6e41a58 100644 --- a/frameworks/js/napi/accesstoken/src/napi_request_global_switch_on_setting.cpp +++ b/frameworks/js/napi/accesstoken/src/napi_request_global_switch_on_setting.cpp @@ -35,7 +35,7 @@ const std::string EXTENSION_TYPE_KEY = "ability.want.params.uiExtensionType"; const std::string UI_EXTENSION_TYPE = "sys/commonUI"; // error code from dialog -const int32_t REQUEST_REALDY_EXIST = 1; +const int32_t REQUEST_ALREADY_EXIST = 1; const int32_t GLOBAL_TYPE_IS_NOT_SUPPORT = 2; const int32_t SWITCH_IS_ALREADY_OPEN = 3; std::mutex g_lockFlag; @@ -47,7 +47,7 @@ static int32_t TransferToJsErrorCode(int32_t errCode) case RET_SUCCESS: jsCode = JS_OK; break; - case REQUEST_REALDY_EXIST: + case REQUEST_ALREADY_EXIST: jsCode = JS_ERROR_REQUEST_IS_ALREADY_EXIST; break; case GLOBAL_TYPE_IS_NOT_SUPPORT: diff --git a/frameworks/js/napi/accesstoken/src/napi_request_permission_on_setting.cpp b/frameworks/js/napi/accesstoken/src/napi_request_permission_on_setting.cpp index ed7f3282ca2c2394981fda7adb6c2c84173c84e3..ecacb1687e44a20571cc1bdee0808a25eb71212a 100644 --- a/frameworks/js/napi/accesstoken/src/napi_request_permission_on_setting.cpp +++ b/frameworks/js/napi/accesstoken/src/napi_request_permission_on_setting.cpp @@ -35,7 +35,7 @@ const std::string EXTENSION_TYPE_KEY = "ability.want.params.uiExtensionType"; const std::string UI_EXTENSION_TYPE = "sys/commonUI"; // error code from dialog -const int32_t REQUEST_REALDY_EXIST = 1; +const int32_t REQUEST_ALREADY_EXIST = 1; const int32_t PERM_NOT_BELONG_TO_SAME_GROUP = 2; const int32_t PERM_IS_NOT_DECLARE = 3; const int32_t ALL_PERM_GRANTED = 4; @@ -50,7 +50,7 @@ static int32_t TransferToJsErrorCode(int32_t errCode) case RET_SUCCESS: jsCode = JS_OK; break; - case REQUEST_REALDY_EXIST: + case REQUEST_ALREADY_EXIST: jsCode = JS_ERROR_REQUEST_IS_ALREADY_EXIST; break; case PERM_NOT_BELONG_TO_SAME_GROUP: diff --git a/interfaces/kits/cj/accesstoken/src/request_global_switch_on_setting.cpp b/interfaces/kits/cj/accesstoken/src/request_global_switch_on_setting.cpp index cc7e96d7bff384f70722f980296f1e8acf713031..377c4c65e686131c110df71040a42e64ba6f84f7 100644 --- a/interfaces/kits/cj/accesstoken/src/request_global_switch_on_setting.cpp +++ b/interfaces/kits/cj/accesstoken/src/request_global_switch_on_setting.cpp @@ -33,7 +33,7 @@ const std::string GLOBAL_SWITCH_RESULT_KEY = "ohos.user.setting.global_switch.re // error code from dialog of global switch const int32_t RET_SUCCESS = 0; -const int32_t REQUEST_REALDY_EXIST = 1; +const int32_t REQUEST_ALREADY_EXIST = 1; const int32_t GLOBAL_TYPE_IS_NOT_SUPPORT = 2; const int32_t SWITCH_IS_ALREADY_OPEN = 3; @@ -48,7 +48,7 @@ static int32_t TransferToCJErrorCode(int32_t errCode) case RET_SUCCESS: cjCode = CJ_OK; break; - case REQUEST_REALDY_EXIST: + case REQUEST_ALREADY_EXIST: cjCode = CJ_ERROR_REQUEST_IS_ALREADY_EXIST; break; case GLOBAL_TYPE_IS_NOT_SUPPORT: diff --git a/interfaces/kits/cj/accesstoken/src/request_permission_on_setting.cpp b/interfaces/kits/cj/accesstoken/src/request_permission_on_setting.cpp index 42d816f86f42f6d286beaf2458802a5ea30c6a94..dffc683174cdd9b0f14d3047046a539587266492 100644 --- a/interfaces/kits/cj/accesstoken/src/request_permission_on_setting.cpp +++ b/interfaces/kits/cj/accesstoken/src/request_permission_on_setting.cpp @@ -33,7 +33,7 @@ const std::string PERMISSION_RESULT_KEY = "ohos.user.setting.permission.result"; // error code from dialog const int32_t RET_SUCCESS = 0; -const int32_t REQUEST_REALDY_EXIST = 1; +const int32_t REQUEST_ALREADY_EXIST = 1; const int32_t PERM_NOT_BELONG_TO_SAME_GROUP = 2; const int32_t PERM_IS_NOT_DECLARE = 3; const int32_t ALL_PERM_GRANTED = 4; @@ -50,7 +50,7 @@ static int32_t TransferToCJErrorCode(int32_t errCode) case RET_SUCCESS: cjCode = CJ_OK; break; - case REQUEST_REALDY_EXIST: + case REQUEST_ALREADY_EXIST: cjCode = CJ_ERROR_REQUEST_IS_ALREADY_EXIST; break; case PERM_NOT_BELONG_TO_SAME_GROUP: