openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://github.com/openharmony/ability_ability_runtime.git synced 2026-08-24 22:21:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

!10309 uiService, JS exception 应该让进程退出

Browse Source 
Merge pull request !10309 from zhubingwei/uiservice-jsexception
This commit is contained in:
openharmony_ci
2024-09-09 11:34:51 +00:00
committed by Gitee
parent 53d3135a60 dc8e6295e4
commit 45560448d6
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/native/ability/native/BUILD.gn
+1
View File
@@ -935,6 +935,7 @@ ohos_shared_library("ui_service_extension") {
"ace_engine:ace_uicontent",
"c_utils:utils",
"common_event_service:cesfwk_innerkits",
"ets_runtime:libark_jsruntime",
"eventhandler:libeventhandler",
"hilog:libhilog",
"hitrace:hitrace_meter",
frameworks/native/ability/native/ui_service_extension_ability/js_ui_service_extension.cpp
+6
View File
@@ -534,7 +534,13 @@ napi_value JsUIServiceExtension::CallObjectMethod(const char* name, napi_value c
}
TAG_LOGD(AAFwkTag::UISERVC_EXT, "CallFunction(%{public}s) ok", name);
napi_value result = nullptr;
TryCatch tryCatch(env);
napi_call_function(env, obj, method, argc, argv, &result);
if (tryCatch.HasCaught()) {
TAG_LOGE(AAFwkTag::UISERVC_EXT, "HandleUncaughtException");
reinterpret_cast<NativeEngine*>(env)->HandleUncaughtException();
}
return result;
}
test/unittest/service_extension_context_test/service_extension_context_test.cpp
+1 -1
View File
@@ -454,7 +454,7 @@ HWTEST_F(ServiceExtensionContextTest, service_extension_context_StartUIServiceEx
int32_t accountId = 1;
StartOptions startOptions;
ErrCode result = serviceExtensionContextTest.StartUIServiceExtensionAbility(want, accountId);
EXPECT_EQ(CHECK_PERMISSION_FAILED, result);
EXPECT_NE(ERR_OK, result);
}
/**
test/unittest/ui_service_extension_test/ui_service_extension_test.cpp
+2 -2
View File
@@ -338,7 +338,7 @@ HWTEST_F(UIServiceExtensionTest, GetWindowOption_0200, TestSize.Level1)
extensionWindowConfig->windowAttribute = Rosen::ExtensionWindowAttribute::SUB_WINDOW;
extensionWindowConfig->subWindowOptions.isModal = false;
extensionWindowConfig->subWindowOptions.isTopmost = true;
int32_t hostWindowId{0};
int32_t hostWindowId{100};
Runtime::Options options;
auto runtime = Runtime::Create(options);
@@ -363,7 +363,7 @@ HWTEST_F(UIServiceExtensionTest, GetWindowOption_0300, TestSize.Level1)
extensionWindowConfig->windowAttribute = Rosen::ExtensionWindowAttribute::SUB_WINDOW;
extensionWindowConfig->subWindowOptions.isModal = true;
extensionWindowConfig->subWindowOptions.isTopmost = false;
int32_t hostWindowId{0};
int32_t hostWindowId{100};
Runtime::Options options;
auto runtime = Runtime::Create(options);