openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/ability_ability_runtime synced 2024-11-23 15:20:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cherry pick 4d6f6e7 from https://gitee.com/zexin_c/ability_ability_runtime/pulls/11187

Browse Source 
revert: changlian context

Signed-off-by: chenzexin <chenzexin14@huawei.com>
This commit is contained in:
chenzexin 2024-10-18 09:59:46 +08:00
parent ea1140e441
commit 8ad12346b7
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
frameworks/native/ability/native/ui_extension_ability/js_ui_extension.cpp
View File

@ -66,28 +66,14 @@ napi_value AttachUIExtensionContext(napi_env env, void *value, void *extValue)
TAG_LOGE(AAFwkTag::UI_EXT, "invalid context");
return nullptr;
}
auto screenModePtr = reinterpret_cast<std::weak_ptr<int32_t> *>(extValue)->lock();
if (screenModePtr == nullptr) {
TAG_LOGE(AAFwkTag::UI_EXT, "Invalid screenModePtr");
napi_value object = JsUIExtensionContext::CreateJsUIExtensionContext(env, ptr);
auto contextRef = JsRuntime::LoadSystemModuleByEngine(env, "application.UIExtensionContext",
&object, 1);
if (contextRef == nullptr) {
TAG_LOGD(AAFwkTag::UI_EXT, "Failed to load module");
return nullptr;
}
napi_value contextObj = nullptr;
if (*screenModePtr == AAFwk::IDLE_SCREEN_MODE) {
auto uiExtObject = JsUIExtensionContext::CreateJsUIExtensionContext(env, ptr);
CHECK_POINTER_AND_RETURN(uiExtObject, nullptr);
auto contextRef = JsRuntime::LoadSystemModuleByEngine(env, "application.UIExtensionContext",
&uiExtObject, 1);
CHECK_POINTER_AND_RETURN(contextRef, nullptr);
contextObj = contextRef->GetNapiValue();
} else {
auto emUIObject = JsEmbeddableUIAbilityContext::CreateJsEmbeddableUIAbilityContext(env,
nullptr, ptr, *screenModePtr);
CHECK_POINTER_AND_RETURN(emUIObject, nullptr);
auto contextRef = JsRuntime::LoadSystemModuleByEngine(env, "application.EmbeddableUIAbilityContext",
&emUIObject, 1);
CHECK_POINTER_AND_RETURN(contextRef, nullptr);
contextObj = contextRef->GetNapiValue();
}
auto contextObj = contextRef->GetNapiValue();
if (contextObj == nullptr) {
TAG_LOGE(AAFwkTag::UI_EXT, "load context error");
return nullptr;