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 cdbdeef99b3d7ab42082a0d9fb059d234d84f2ee..f11b544c526e3ef31d9dcb1ca160a99040cbb5ea 100644 --- a/frameworks/ets/ani/accesstoken/src/ani_ability_access_ctrl.cpp +++ b/frameworks/ets/ani/accesstoken/src/ani_ability_access_ctrl.cpp @@ -267,7 +267,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::ValidateTokenIDWithThrowError(env, tokenID)) || + if ((!BusinessErrorAni::ValidateTokenIDdWithThrowError(env, tokenID)) || (!BusinessErrorAni::ValidatePermissionWithThrowError(env, permissionName))) { LOGE(ATM_DOMAIN, ATM_TAG, "TokenId(%{public}u) or Permission(%{public}s) is invalid.", tokenID, permissionName.c_str()); @@ -302,7 +302,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::ValidateTokenIDWithThrowError(env, tokenID)) || + if ((!BusinessErrorAni::ValidateTokenIDdWithThrowError(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.", @@ -336,7 +336,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::ValidateTokenIDWithThrowError(env, tokenID)) || + if ((!BusinessErrorAni::ValidateTokenIDdWithThrowError(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.", @@ -386,7 +386,7 @@ static ani_ref GetPermissionsStatusExecute([[maybe_unused]] ani_env* env, return nullptr; } AccessTokenID tokenID = static_cast(aniTokenID); - if (!BusinessErrorAni::ValidateTokenIDWithThrowError(env, tokenID)) { + if (!BusinessErrorAni::ValidateTokenIDdWithThrowError(env, tokenID)) { LOGE(ATM_DOMAIN, ATM_TAG, "TokenId(%{public}u) is invalid.", tokenID); return nullptr; } @@ -430,7 +430,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::ValidateTokenIDWithThrowError(env, tokenID)) || + if ((!BusinessErrorAni::ValidateTokenIDdWithThrowError(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 4537f39cfb872c8d5736fb34eedd03e6acabed6f..93d8f2a6e93c96a9d496a65ecd5c5b60c6d2c460 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 @@ std::shared_ptr g_requestInstanceControl = nullptr; std::mutex g_requestInstanceControlLock; // error code from dialog -constexpr int32_t REQUEST_ALREADY_EXIST = 1; +constexpr int32_t REQUEST_REALDY_EXIST = 1; constexpr int32_t GLOBAL_TYPE_IS_NOT_SUPPORT = 2; constexpr int32_t SWITCH_IS_ALREADY_OPEN = 3; } @@ -62,7 +62,7 @@ int32_t RequestGlobalSwitchAsyncContext::ConvertErrorCode(int32_t errCode) case RET_SUCCESS: stsCode = STS_OK; break; - case REQUEST_ALREADY_EXIST: + case REQUEST_REALDY_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 aabb449cd9bc0927f562a5d5f52e0cf45e4ed64f..e1cfcb1baf7e068ffe9bba2d601ee5a943da96ff 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 @@ -23,7 +23,7 @@ namespace OHOS { namespace Security { namespace AccessToken { namespace { -constexpr int32_t REQUEST_ALREADY_EXIST = 1; +constexpr int32_t REQUEST_REALDY_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; @@ -118,7 +118,7 @@ int32_t RequestPermOnSettingAsyncContext::ConvertErrorCode(int32_t errorCode) case RET_SUCCESS: stsCode = STS_OK; break; - case REQUEST_ALREADY_EXIST: + case REQUEST_REALDY_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 4e1f1b60bb97424a0ff77f1d0d78aac97cf2d932..e47fe113372111c792d696a2f5c4493d246eada9 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 ValidateTokenIDWithThrowError(ani_env* env, AccessTokenID tokenID); + static bool ValidateTokenIDdWithThrowError(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 d01e6bbbe13d5189709cb7fe9514250969b1765e..f2433f1eebf76f1e551deec86596c037a2610af8 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::ValidateTokenIDWithThrowError(ani_env* env, AccessTokenID tokenID) +bool BusinessErrorAni::ValidateTokenIDdWithThrowError(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 29424fa9a2fed37a85feed9ef2e43b54223605a5..008a93be6b7c427c9003db2f76f0bd7dc518f931 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::ValidateTokenIDWithThrowError(env, tokenID)) || + if ((!BusinessErrorAni::ValidateTokenIDdWithThrowError(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::ValidateTokenIDWithThrowError(env, tokenID)) || + if ((!BusinessErrorAni::ValidateTokenIDdWithThrowError(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::ValidateTokenIDWithThrowError(env, tokenID)) || + if ((!BusinessErrorAni::ValidateTokenIDdWithThrowError(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 1162dba5fee9dbce1282a0def1496f917474a7ed..a1a525a867324645dadbd976e69532d118d10595 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_ALREADY_EXIST = 1; +const int32_t REQUEST_REALDY_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_ALREADY_EXIST: + case REQUEST_REALDY_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 59d0e6143489e3267021d3d6c4ad50e65536b6a8..1799deddd483010a23aedec7bcafe8865cbc96f3 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_ALREADY_EXIST = 1; +const int32_t REQUEST_REALDY_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_ALREADY_EXIST: + case REQUEST_REALDY_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 377c4c65e686131c110df71040a42e64ba6f84f7..cc7e96d7bff384f70722f980296f1e8acf713031 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_ALREADY_EXIST = 1; +const int32_t REQUEST_REALDY_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_ALREADY_EXIST: + case REQUEST_REALDY_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 dffc683174cdd9b0f14d3047046a539587266492..42d816f86f42f6d286beaf2458802a5ea30c6a94 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_ALREADY_EXIST = 1; +const int32_t REQUEST_REALDY_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_ALREADY_EXIST: + case REQUEST_REALDY_EXIST: cjCode = CJ_ERROR_REQUEST_IS_ALREADY_EXIST; break; case PERM_NOT_BELONG_TO_SAME_GROUP: diff --git a/services/accesstokenmanager/test/database_dlopen/database_dlopen_coverage_test.cpp b/services/accesstokenmanager/test/database_dlopen/database_dlopen_coverage_test.cpp index ea42a01544c91ce3f390be114b2a34180410719c..9838e84848d8941ba4dfaacfc04d3980683d8fcf 100644 --- a/services/accesstokenmanager/test/database_dlopen/database_dlopen_coverage_test.cpp +++ b/services/accesstokenmanager/test/database_dlopen/database_dlopen_coverage_test.cpp @@ -28,7 +28,6 @@ namespace Security { namespace AccessToken { namespace { constexpr const int32_t WAIT_EVENTHANDLE_TIME = 2; -constexpr const int32_t WAIT_DELAY_DLCLOSE_TIME = 7; } class AccessTokenDatabaseDlopenTest : public testing::Test { public: