From c779849b203a49bcb759e3d363de57f0d4591ff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E5=97=A3=E9=92=8A?= Date: Wed, 13 Aug 2025 18:06:52 +0800 Subject: [PATCH] errorcode bug fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 段嗣钊 Change-Id: I54b0d12a68d13a2098096a9e3fd15383680f061f --- .../ability_business_error.cpp | 6 +- .../include/ability_manager_errors.h | 146 +++++++++--------- .../ability_business_error.h | 2 +- 3 files changed, 73 insertions(+), 81 deletions(-) diff --git a/frameworks/native/ability/native/ability_business_error/ability_business_error.cpp b/frameworks/native/ability/native/ability_business_error/ability_business_error.cpp index ae6916ad2c0..f6db665400b 100644 --- a/frameworks/native/ability/native/ability_business_error/ability_business_error.cpp +++ b/frameworks/native/ability/native/ability_business_error/ability_business_error.cpp @@ -55,7 +55,7 @@ constexpr const char* ERROR_MSG_FREE_INSTALL_CROSS_DEVICE = "Cross-device instal constexpr const char* ERROR_MSG_INVALID_URI_FLAG = "Invalid URI flag."; constexpr const char* ERROR_MSG_INVALID_URI_TYPE = "Invalid URI type."; constexpr const char* ERROR_MSG_GRANT_URI_PERMISSION = "A sandbox application cannot grant URI permission."; -constexpr const char* ERROR_MSG_GET_BUNDLE_INFO_FAILED = "Failed to obtain the target application information."; +constexpr const char* ERROR_MSG_GET_APPLICATION_INFO_FAILED = "Failed to obtain the target application information."; constexpr const char* ERROR_MSG_OPERATION_NOT_SUPPORTED = "Operation not supported."; constexpr const char* ERROR_MSG_CHILD_PROCESS_NUMBER_EXCEEDS_UPPER_BOUND = "The number of child processes exceeds the upper limit."; @@ -179,7 +179,7 @@ static std::unordered_map ERR_CODE_MAP = { { AbilityErrorCode::ERROR_CODE_INVALID_URI_FLAG, ERROR_MSG_INVALID_URI_FLAG }, { AbilityErrorCode::ERROR_CODE_INVALID_URI_TYPE, ERROR_MSG_INVALID_URI_TYPE }, { AbilityErrorCode::ERROR_CODE_GRANT_URI_PERMISSION, ERROR_MSG_GRANT_URI_PERMISSION }, - { AbilityErrorCode::ERROR_CODE_GET_BUNFLE_INFO_FAILED, ERROR_MSG_GET_BUNDLE_INFO_FAILED}, + { AbilityErrorCode::ERROR_CODE_GET_APPLICATION_INFO_FAILED, ERROR_MSG_GET_APPLICATION_INFO_FAILED}, { AbilityErrorCode::ERROR_CODE_OPERATION_NOT_SUPPORTED, ERROR_MSG_OPERATION_NOT_SUPPORTED }, { AbilityErrorCode::ERROR_CODE_CHILD_PROCESS_NUMBER_EXCEEDS_UPPER_BOUND, ERROR_MSG_CHILD_PROCESS_NUMBER_EXCEEDS_UPPER_BOUND }, @@ -268,7 +268,7 @@ static std::unordered_map INNER_TO_JS_ERROR_CODE_MAP {ERR_CODE_INVALID_URI_FLAG, AbilityErrorCode::ERROR_CODE_INVALID_URI_FLAG}, {ERR_CODE_INVALID_URI_TYPE, AbilityErrorCode::ERROR_CODE_INVALID_URI_TYPE}, {ERR_CODE_GRANT_URI_PERMISSION, AbilityErrorCode::ERROR_CODE_GRANT_URI_PERMISSION}, - {ERR_GET_TARGET_BUNDLE_INFO_FAILED, AbilityErrorCode::ERROR_CODE_GET_BUNFLE_INFO_FAILED}, + {ERR_GET_TARGET_BUNDLE_INFO_FAILED, AbilityErrorCode::ERROR_CODE_GET_APPLICATION_INFO_FAILED}, {ERR_NOT_SELF_APPLICATION, AbilityErrorCode::ERROR_NOT_SELF_APPLICATION}, // Installation-free error code transfer {HAP_PACKAGE_DOWNLOAD_TIMED_OUT, AbilityErrorCode::ERROR_CODE_NETWORK_ABNORMAL}, diff --git a/interfaces/inner_api/ability_manager/include/ability_manager_errors.h b/interfaces/inner_api/ability_manager/include/ability_manager_errors.h index 0a56c748513..7d56a56c228 100644 --- a/interfaces/inner_api/ability_manager/include/ability_manager_errors.h +++ b/interfaces/inner_api/ability_manager/include/ability_manager_errors.h @@ -28,7 +28,7 @@ enum { */ ABILITY_MODULE_TYPE_SERVICE = 0, /** - * Module type: ABility Kit side + * Module type: Ability Kit side */ ABILITY_MODULE_TYPE_KIT = 1, /** @@ -51,7 +51,7 @@ enum { */ GET_ABILITY_SERVICE_FAILED, /** - * Result(2097154) for Connect State: An error of the the ability service not connect. + * Result(2097154) for Connect State: An error of the ability service not connect. */ ABILITY_SERVICE_NOT_CONNECTED, /** @@ -355,7 +355,7 @@ enum { ERR_COLLABORATOR_NOTIFY_FAILED, /** - * Result(2097219) for prouct application boot setting. + * Result(2097219) for product application boot setting. */ ERR_NOT_SUPPORTED_PRODUCT_TYPE, @@ -994,6 +994,72 @@ enum { ERR_PRELOAD_APP_DATA_ABILITIES_FAILED = 2097399, + /** + * Result (2098000-2098049) Error code refinement INVALID_VALUE. + */ + ERR_REFINEMENT_INVALID_VALUE_BEGIN = 2098000, + + ERR_CONNECT_MANAGER_NULL_ABILITY_RECORD = 2098001, + + ERR_UI_ABILITY_MANAGER_NULL_ABILITY_RECORD = 2098002, + + ERR_NULL_APP_MGR_CLIENT = 2098004, + + ERR_ADD_START_CONTROL_PARAM_FAILED = 2098005, + + ERR_NULL_FREE_INSTALL_MANAGER = 2098006, + + ERR_GET_MISSION_ID_BY_ABILITY_TOKEN_FAILED = 2098007, + + ERR_INVALID_MISSION_ID = 2098008, + + ERR_NULL_SYS_DIALOG_SCHEDULER = 2098009, + + ERR_CHECK_CALL_FROM_BACKGROUND_FAILED = 2098010, + + ERR_TOO_LARGE_APPINDEXES = 2098011, + + ERR_FREQ_START_ABILITY = 2098012, + + ERR_CALLER_IS_KILLING = 2098013, + + ERR_NOTIFY_SCB_PENDING_ACTIVATION_FAILED = 2098014, + + ERR_FREE_INSTALL_REMOTE_WANT = 2098015, + + ERR_REFINEMENT_INVALID_VALUE_END = 2098049, + + /** + * Result (2098050-2098099) Error code refinement INNERR_ERROR. + */ + ERR_REFINEMENT_INNER_ERROR_BEGIN = 2098050, + + ERR_APP_MGR_TERMINATTE_ABILITY_FAILED = 2098051, + + ERR_REFINEMENT_INNER_ERROR_END = 2098099, + + /** + * Result (2099100-2099149) Error code refinement RESOLVE_ABILITY_ERR. + */ + ERR_REFINEMENT_RESOLVE_ABILITY_BEGIN = 2099100, + + ERR_CHECK_PLUGIN_NULL_RECORD = 2099101, + + ERR_CALLER_IS_PLUGIN_ABILITY = 2099102, + + ERR_CHECK_PLUGIN_INVALID_TYPE = 2099103, + + ERR_REFINEMENT_RESOLVE_ABILITY_END = 2099149, + + /** + * Result (2099150-2099199) Error code refinement ERR_INVALID_CALLER. + */ + ERR_REFINEMENT_INVALID_CALLER_BEGIN = 2099150, + + ERR_IS_NOT_SPECIFIED_SA = 2099151, + + ERR_REFINEMENT_INVALID_CALLER_END = 2099199, + /** * Native error(3000000) for target bundle not exist. */ @@ -1241,80 +1307,6 @@ enum NativeFreeInstallError { */ UNDEFINE_ERROR_CODE = 3, }; - -enum { - /** - * Result (2098000-2098049) Error code refinement INVALID_VALUE. - */ - ERR_REFINEMENT_INVALID_VALUE_BEGIN = 2098000, - - ERR_CONNECT_MANAGER_NULL_ABILITY_RECORD = 2098001, - - ERR_UI_ABILITY_MANAGER_NULL_ABILITY_RECORD = 2098002, - - ERR_NULL_APP_MGR_CLIENT = 2098004, - - ERR_ADD_START_CONTROL_PARAM_FAILED = 2098005, - - ERR_NULL_FREE_INSTALL_MANAGER = 2098006, - - ERR_GET_MISSION_ID_BY_ABILITY_TOKEN_FAILED = 2098007, - - ERR_INVALID_MISSION_ID = 2098008, - - ERR_NULL_SYS_DIALOG_SCHEDULER = 2098009, - - ERR_CHECK_CALL_FROM_BACKGROUND_FAILED = 2098010, - - ERR_TOO_LARGE_APPINDEXES = 2098011, - - ERR_FREQ_START_ABILITY = 2098012, - - ERR_CALLER_IS_KILLING = 2098013, - - ERR_NOTIFY_SCB_PENDING_ACTIVATION_FAILED = 2098014, - - ERR_FREE_INSTALL_REMOTE_WANT = 2098015, - - ERR_REFINEMENT_INVALID_VALUE_END = 2098049 -}; - -enum { - /** - * Result (2098050-2098099) Error code refinement INNERR_ERROR. - */ - ERR_REFINEMENT_INNER_ERROR_BEGIN = 2098050, - - ERR_APP_MGR_TERMINATTE_ABILITY_FAILED = 2098051, - - ERR_REFINEMENT_INNER_ERROR_END = 2098099 -}; - -enum { - /** - * Result (2099100-2099149) Error code refinement RESOLVE_ABILITY_ERR. - */ - ERR_REFINEMENT_RESOLVE_ABILITY_BEGIN = 2099100, - - ERR_CHECK_PLUGIN_NULL_RECORD = 2099101, - - ERR_CALLER_IS_PLUGIN_ABILITY = 2099102, - - ERR_CHECK_PLUGIN_INVALID_TYPE = 2099103, - - ERR_REFINEMENT_RESOLVE_ABILITY_END = 2099149 -}; - -enum { - /** - * Result (2099150-2099199) Error code refinement ERR_INVALID_CALLER. - */ - ERR_REFINEMENT_INVALID_CALLER_BEGIN = 2099150, - - ERR_IS_NOT_SPECIFIED_SA = 2099151, - - ERR_REFINEMENT_INVALID_CALLER_END = 2099199 -}; } // namespace AAFwk } // namespace OHOS #endif // OHOS_ABILITY_RUNTIME_ABILITY_MANAGER_ERRORS_H diff --git a/interfaces/kits/native/ability/native/ability_business_error/ability_business_error.h b/interfaces/kits/native/ability/native/ability_business_error/ability_business_error.h index fc00e2a877f..075f1e7263b 100644 --- a/interfaces/kits/native/ability/native/ability_business_error/ability_business_error.h +++ b/interfaces/kits/native/ability/native/ability_business_error/ability_business_error.h @@ -181,7 +181,7 @@ enum class AbilityErrorCode { ERROR_CODE_CREATE_NEW_INSTANCE_NOT_SUPPORT = 16000080, // Target application not found. - ERROR_CODE_GET_BUNFLE_INFO_FAILED = 16000081, + ERROR_CODE_GET_APPLICATION_INFO_FAILED = 16000081, // UIAbility is in starting state. ERROR_CODE_UI_ABILITY_IS_STARTING = 16000082, -- Gitee