diff --git a/frameworks/native/ability/native/ability_runtime/js_ability_context.cpp b/frameworks/native/ability/native/ability_runtime/js_ability_context.cpp index dc7fd4ddcb..d812fbc917 100644 --- a/frameworks/native/ability/native/ability_runtime/js_ability_context.cpp +++ b/frameworks/native/ability/native/ability_runtime/js_ability_context.cpp @@ -71,8 +71,6 @@ const std::string KEY_REQUEST_ID = "com.ohos.param.requestId"; const std::string TRACE_ATOMIC_SERVICE = "StartAtomicService"; constexpr int32_t CALLER_TIME_OUT = 10; // 10s const std::string JSON_KEY_ERR_MSG = "errMsg"; -constexpr const int32_t API26 = 26; -constexpr const int32_t API_VERSION_MOD = 100; namespace { static std::map, KeyCompare> g_connects; @@ -354,49 +352,12 @@ napi_value JsAbilityContext::ConnectAbilityWithAccount(napi_env env, napi_callba GET_NAPI_INFO_AND_CALL(env, info, JsAbilityContext, OnConnectAbilityWithAccount); } -napi_value JsAbilityContext::ConnectAbilityWithAccountRestricted(napi_env env, napi_callback_info info) -{ - NapiCallbackInfo napiInfo; - JsAbilityContext* jsContext = static_cast( - GetNapiCallbackInfoAndThis(env, info, napiInfo, nullptr)); - if (jsContext == nullptr) { - return CreateJsUndefined(env); - } - if (CheckSatisfyTargetAPIVersion(jsContext->context_, API26)) { - TAG_LOGE(AAFwkTag::CONTEXT, "connectAbilityWithAccount is not supported for API 26+"); - ThrowInvalidParamError(env, "connectAbilityWithAccount is not supported for API 26+, " - "please use connectServiceExtensionAbilityWithAccount instead."); - return CreateJsUndefined(env); - } - - GET_NAPI_INFO_AND_CALL(env, info, JsAbilityContext, OnConnectAbilityWithAccount); -} - napi_value JsAbilityContext::DisconnectAbility(napi_env env, napi_callback_info info) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); GET_NAPI_INFO_AND_CALL(env, info, JsAbilityContext, OnDisconnectAbility); } -napi_value JsAbilityContext::DisconnectAbilityRestricted(napi_env env, napi_callback_info info) -{ - HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - NapiCallbackInfo napiInfo; - JsAbilityContext* jsContext = static_cast( - GetNapiCallbackInfoAndThis(env, info, napiInfo, nullptr)); - if (jsContext == nullptr) { - return CreateJsUndefined(env); - } - if (CheckSatisfyTargetAPIVersion(jsContext->context_, API26)) { - TAG_LOGE(AAFwkTag::CONTEXT, "disconnectAbility is not supported for API 26+"); - ThrowInvalidParamError(env, "disconnectAbility is not supported for API 26+, " - "please use disconnectServiceExtensionAbility instead."); - return CreateJsUndefined(env); - } - - GET_NAPI_INFO_AND_CALL(env, info, JsAbilityContext, OnDisconnectAbility); -} - napi_value JsAbilityContext::TerminateSelf(napi_env env, napi_callback_info info) { GET_NAPI_INFO_AND_CALL(env, info, JsAbilityContext, OnTerminateSelf); @@ -2467,10 +2428,10 @@ napi_value CreateJsAbilityContext(napi_env env, std::shared_ptr JsAbilityContext::StopServiceExtensionAbilityWithAccount); BindNativeFunction(env, object, "connectServiceExtensionAbility", moduleName, JsAbilityContext::ConnectAbility); BindNativeFunction(env, object, "connectAbilityWithAccount", moduleName, - JsAbilityContext::ConnectAbilityWithAccountRestricted); + JsAbilityContext::ConnectAbilityWithAccount); BindNativeFunction(env, object, "connectServiceExtensionAbilityWithAccount", moduleName, JsAbilityContext::ConnectAbilityWithAccount); - BindNativeFunction(env, object, "disconnectAbility", moduleName, JsAbilityContext::DisconnectAbilityRestricted); + BindNativeFunction(env, object, "disconnectAbility", moduleName, JsAbilityContext::DisconnectAbility); BindNativeFunction( env, object, "disconnectServiceExtensionAbility", moduleName, JsAbilityContext::DisconnectAbility); BindNativeFunction(env, object, "terminateSelf", moduleName, JsAbilityContext::TerminateSelf); @@ -3590,25 +3551,6 @@ napi_value JsAbilityContext::OnSetMissionWindowIcon(napi_env env, NapiCallbackIn #endif } -bool JsAbilityContext::CheckSatisfyTargetAPIVersion( - const std::weak_ptr& context, int32_t version) -{ - auto abilityContext = context.lock(); - if (!abilityContext) { - TAG_LOGE(AAFwkTag::CONTEXT, "null context when check api version"); - return false; - } - - auto applicationInfo = abilityContext->GetApplicationInfo(); - if (!applicationInfo) { - TAG_LOGE(AAFwkTag::CONTEXT, "null applicationInfo"); - return false; - } - - TAG_LOGD(AAFwkTag::CONTEXT, "targetAPIVersion: %{public}d", applicationInfo->apiTargetVersion); - return applicationInfo->apiTargetVersion % API_VERSION_MOD >= version; -} - int32_t JsAbilityContext::GenerateRequestCode() { std::lock_guard lock(requestCodeMutex_); diff --git a/frameworks/native/ability/native/js_service_extension_context.cpp b/frameworks/native/ability/native/js_service_extension_context.cpp index 75c9715821..52f3678900 100644 --- a/frameworks/native/ability/native/js_service_extension_context.cpp +++ b/frameworks/native/ability/native/js_service_extension_context.cpp @@ -56,8 +56,6 @@ constexpr size_t ARGC_FOUR = 4; constexpr const char* ATOMIC_SERVICE_PREFIX = "com.atomicservice."; const std::string JSON_KEY_ERR_MSG = "errMsg"; const std::string KEY_REQUEST_ID = "com.ohos.param.requestId"; -constexpr const int32_t API26 = 26; -constexpr const int32_t API_VERSION_MOD = 100; class StartAbilityByCallParameters { public: @@ -142,24 +140,6 @@ public: GET_NAPI_INFO_AND_CALL(env, info, JsServiceExtensionContext, OnConnectAbilityWithAccount); } - static napi_value ConnectAbilityWithAccountRestricted(napi_env env, napi_callback_info info) - { - NapiCallbackInfo napiInfo; - JsServiceExtensionContext* jsContext = static_cast( - GetNapiCallbackInfoAndThis(env, info, napiInfo, nullptr)); - if (jsContext == nullptr) { - return CreateJsUndefined(env); - } - if (CheckSatisfyTargetAPIVersion(jsContext->context_, API26)) { - TAG_LOGE(AAFwkTag::SERVICE_EXT, "connectAbilityWithAccount is not supported for API 26+"); - ThrowInvalidParamError(env, "connectAbilityWithAccount is not supported for API 26+, " - "please use connectServiceExtensionAbilityWithAccount instead."); - return CreateJsUndefined(env); - } - - GET_NAPI_INFO_AND_CALL(env, info, JsServiceExtensionContext, OnConnectAbilityWithAccount); - } - static napi_value TerminateAbility(napi_env env, napi_callback_info info) { GET_NAPI_INFO_AND_CALL(env, info, JsServiceExtensionContext, OnTerminateAbility); @@ -175,24 +155,6 @@ public: GET_NAPI_INFO_AND_CALL(env, info, JsServiceExtensionContext, OnDisconnectAbility); } - static napi_value DisconnectAbilityRestricted(napi_env env, napi_callback_info info) - { - NapiCallbackInfo napiInfo; - JsServiceExtensionContext* jsContext = static_cast( - GetNapiCallbackInfoAndThis(env, info, napiInfo, nullptr)); - if (jsContext == nullptr) { - return CreateJsUndefined(env); - } - if (CheckSatisfyTargetAPIVersion(jsContext->context_, API26)) { - TAG_LOGE(AAFwkTag::SERVICE_EXT, "disconnectAbility is not supported for API 26+"); - ThrowInvalidParamError(env, "disconnectAbility is not supported for API 26+, " - "please use disconnectServiceExtensionAbility instead."); - return CreateJsUndefined(env); - } - - GET_NAPI_INFO_AND_CALL(env, info, JsServiceExtensionContext, OnDisconnectAbility); - } - static napi_value StartServiceExtensionAbility(napi_env env, napi_callback_info info) { GET_NAPI_INFO_AND_CALL(env, info, JsServiceExtensionContext, OnStartExtensionAbility); @@ -239,8 +201,6 @@ public: } private: - static bool CheckSatisfyTargetAPIVersion( - const std::weak_ptr& context, int32_t version); std::weak_ptr context_; sptr freeInstallObserver_ = nullptr; static void ClearFailedCallConnection( @@ -1726,7 +1686,7 @@ napi_value CreateJsServiceExtensionContext(napi_env env, std::shared_ptr& context, int32_t version) -{ - auto extensionContext = context.lock(); - if (!extensionContext) { - TAG_LOGE(AAFwkTag::SERVICE_EXT, "null context when check api version"); - return false; - } - - auto applicationInfo = extensionContext->GetApplicationInfo(); - if (!applicationInfo) { - TAG_LOGE(AAFwkTag::SERVICE_EXT, "null applicationInfo"); - return false; - } - - TAG_LOGD(AAFwkTag::SERVICE_EXT, "targetAPIVersion: %{public}d", applicationInfo->apiTargetVersion); - return applicationInfo->apiTargetVersion % API_VERSION_MOD >= version; -} } // namespace AbilityRuntime } // namespace OHOS diff --git a/frameworks/native/appkit/ability_runtime/context/js_application_context_utils.cpp b/frameworks/native/appkit/ability_runtime/context/js_application_context_utils.cpp index 7ec446c495..4c24d83fe7 100644 --- a/frameworks/native/appkit/ability_runtime/context/js_application_context_utils.cpp +++ b/frameworks/native/appkit/ability_runtime/context/js_application_context_utils.cpp @@ -57,8 +57,6 @@ constexpr size_t INDEX_TWO = 2; constexpr int32_t ERROR_CODE_ONE = 1; constexpr double FOUNT_SIZE = 0.0; const char* MD_NAME = "JsApplicationContextUtils"; -constexpr const int32_t API26 = 26; -constexpr const int32_t API_VERSION_MOD = 100; } // namespace napi_value JsApplicationContextUtils::CreateBundleContext(napi_env env, napi_callback_info info) @@ -1279,10 +1277,6 @@ napi_value JsApplicationContextUtils::OnRegisterAbilityLifecycleCallback( TAG_LOGE(AAFwkTag::APPKIT, "null applicationContext"); return CreateJsUndefined(env); } - if (applicationContext->GetApplicationInfo()->apiTargetVersion % API_VERSION_MOD >= API26) { - TAG_LOGE(AAFwkTag::APPKIT, "reject registerAbilityLifecycleCallback"); - return CreateJsUndefined(env); - } if (callback_ != nullptr) { TAG_LOGD(AAFwkTag::APPKIT, "callback_ is not nullptr"); return CreateJsValue(env, callback_->Register(info.argv[0])); @@ -1303,10 +1297,6 @@ napi_value JsApplicationContextUtils::OnUnregisterAbilityLifecycleCallback( TAG_LOGE(AAFwkTag::APPKIT, "null ApplicationContext"); errCode = ERROR_CODE_ONE; } - if (applicationContext->GetApplicationInfo()->apiTargetVersion % API_VERSION_MOD >= API26) { - TAG_LOGE(AAFwkTag::APPKIT, "reject unregisterAbilityLifecycleCallback"); - return CreateJsUndefined(env); - } int32_t callbackId = -1; if (info.argc != ARGC_ONE && info.argc != ARGC_TWO) { TAG_LOGE(AAFwkTag::APPKIT, "not enough params"); @@ -1375,10 +1365,6 @@ napi_value JsApplicationContextUtils::OnRegisterEnvironmentCallback( TAG_LOGE(AAFwkTag::APPKIT, "null applicationContext"); return CreateJsUndefined(env); } - if (applicationContext->GetApplicationInfo()->apiTargetVersion % API_VERSION_MOD >= API26) { - TAG_LOGE(AAFwkTag::APPKIT, "reject registerEnvironmentCallback"); - return CreateJsUndefined(env); - } if (envCallback_ != nullptr) { TAG_LOGD(AAFwkTag::APPKIT, "envCallback_ is not nullptr"); return CreateJsValue(env, envCallback_->Register(info.argv[0])); @@ -1398,10 +1384,6 @@ napi_value JsApplicationContextUtils::OnUnregisterEnvironmentCallback( TAG_LOGE(AAFwkTag::APPKIT, "null applicationContext"); errCode = ERROR_CODE_ONE; } - if (applicationContext->GetApplicationInfo()->apiTargetVersion % API_VERSION_MOD >= API26) { - TAG_LOGE(AAFwkTag::APPKIT, "reject unregisterEnvironmentCallback"); - return CreateJsUndefined(env); - } int32_t callbackId = -1; if (info.argc != ARGC_ONE && info.argc != ARGC_TWO) { TAG_LOGE(AAFwkTag::APPKIT, "Not enough params"); diff --git a/interfaces/kits/native/ability/native/ability_runtime/js_ability_context.h b/interfaces/kits/native/ability/native/ability_runtime/js_ability_context.h index 1647bf04da..191c3d69f5 100644 --- a/interfaces/kits/native/ability/native/ability_runtime/js_ability_context.h +++ b/interfaces/kits/native/ability/native/ability_runtime/js_ability_context.h @@ -54,9 +54,7 @@ public: static napi_value StopServiceExtensionAbilityWithAccount(napi_env env, napi_callback_info info); static napi_value ConnectAbility(napi_env env, napi_callback_info info); static napi_value ConnectAbilityWithAccount(napi_env env, napi_callback_info info); - static napi_value ConnectAbilityWithAccountRestricted(napi_env env, napi_callback_info info); static napi_value DisconnectAbility(napi_env env, napi_callback_info info); - static napi_value DisconnectAbilityRestricted(napi_env env, napi_callback_info info); static napi_value TerminateSelf(napi_env env, napi_callback_info info); static napi_value TerminateSelfWithResult(napi_env env, napi_callback_info info); static napi_value BackToCallerAbilityWithResult(napi_env env, napi_callback_info info); @@ -113,8 +111,6 @@ private: private: static void ClearFailedCallConnection( const std::weak_ptr& abilityContext, const std::shared_ptr &callback); - static bool CheckSatisfyTargetAPIVersion( - const std::weak_ptr& context, int32_t version); napi_value OnStartAbility(napi_env env, NapiCallbackInfo& info, bool isStartRecent = false); napi_value OnOpenLink(napi_env env, NapiCallbackInfo& info); napi_value OnOpenLinkInner(napi_env env, const AAFwk::Want &want, int requestCode, const std::string &startTime,