From 74970fac11ff12a47d45b2b61f7b73afe53bfa76 Mon Sep 17 00:00:00 2001 From: AsukaSoryu Date: Thu, 7 Aug 2025 20:26:00 +0800 Subject: [PATCH] fix errcode for disconnectability Signed-off-by: gongyuechen Change-Id: I62a3bf1ee99a42586f8aa65e2732f2300a761b29 --- .../ability/native/js_service_extension_context.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/frameworks/native/ability/native/js_service_extension_context.cpp b/frameworks/native/ability/native/js_service_extension_context.cpp index 2c33dfca2cb..4fa41d00ad4 100644 --- a/frameworks/native/ability/native/js_service_extension_context.cpp +++ b/frameworks/native/ability/native/js_service_extension_context.cpp @@ -48,8 +48,6 @@ constexpr int32_t INDEX_ONE = 1; constexpr int32_t INDEX_TWO = 2; constexpr int32_t INDEX_THREE = 3; constexpr int32_t INDEX_FOUR = 4; -constexpr int32_t ERROR_CODE_ONE = 1; -constexpr int32_t ERROR_CODE_TWO = 2; constexpr size_t ARGC_ZERO = 0; constexpr size_t ARGC_ONE = 1; constexpr size_t ARGC_TWO = 2; @@ -1091,12 +1089,12 @@ private: auto context = weak.lock(); if (!context) { TAG_LOGW(AAFwkTag::SERVICE_EXT, "context released"); - *innerErrCode = static_cast(ERROR_CODE_ONE); + *innerErrCode = static_cast(AbilityErrorCode::ERROR_CODE_INVALID_CONTEXT); return; } if (!connection) { TAG_LOGW(AAFwkTag::SERVICE_EXT, "null connection"); - *innerErrCode = static_cast(ERROR_CODE_TWO); + *innerErrCode = static_cast(AbilityErrorCode::ERROR_CODE_INNER); return; } TAG_LOGD(AAFwkTag::SERVICE_EXT, "context->DisconnectAbility"); @@ -1106,9 +1104,9 @@ private: [innerErrCode](napi_env env, NapiAsyncTask& task, int32_t status) { if (*innerErrCode == ERR_OK) { task.Resolve(env, CreateJsUndefined(env)); - } else if (*innerErrCode == ERROR_CODE_ONE) { + } else if (*innerErrCode == static_cast(AbilityErrorCode::ERROR_CODE_INVALID_CONTEXT)) { task.Reject(env, CreateJsError(env, *innerErrCode, "Context is released")); - } else if (*innerErrCode == ERROR_CODE_TWO) { + } else if (*innerErrCode == static_cast(AbilityErrorCode::ERROR_CODE_INNER)) { task.Reject(env, CreateJsError(env, *innerErrCode, "not found connection")); } else { task.Reject(env, CreateJsErrorByNativeErr(env, *innerErrCode)); -- Gitee