From: DongHyun Song Date: Tue, 31 Mar 2020 01:44:06 +0000 (+0900) Subject: [Service][Global] Remove ServiceClient X-Git-Tag: accepted/tizen/unified/20200402.163217^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F03%2F227903%2F8;p=platform%2Fframework%2Fweb%2Fwrtjs.git [Service][Global] Remove ServiceClient ServiceClient is replaced by separated simple module like as wrt-service-client. https://github.sec.samsung.net/VD-WebPlatform/wrt-service-client So, this patch will remove all ServiceClient related calls Related patch: https://review.tizen.org/gerrit/227784/ Change-Id: I8bfb95d89f72988912c64b087c72ee9669ce6ea2 Signed-off-by: DongHyun Song --- diff --git a/wrt_app/service/main.js b/wrt_app/service/main.js index 9dfdf0f..7f8b055 100755 --- a/wrt_app/service/main.js +++ b/wrt_app/service/main.js @@ -26,8 +26,8 @@ var sandbox = []; var sandbox_count = 0; var service_source = []; -wrt.on('start-service', (event, internal_id, permissions) => { - console.log('start service app : ' + internal_id + ', permissions : ' + permissions); +wrt.on('start-service', (event, internal_id) => { + console.log('start service app : ' + internal_id); if (sandbox[internal_id] === undefined) { if (sandbox_count === 0) { new XWalkExtension(); @@ -43,6 +43,8 @@ wrt.on('start-service', (event, internal_id, permissions) => { if (wrt.tv) { sandbox[internal_id].webapis = webapis; } + let permissions = wrt.getPrivileges(internal_id); + console.log('permissions : ' + permissions); let access_control_manager = new AccessControlManager(permissions, sandbox[internal_id]); access_control_manager.initialize(); for (let key in global) { @@ -63,18 +65,10 @@ wrt.on('start-service', (event, internal_id, permissions) => { } let options = { filename: internal_id }; let service_id = internal_id.substr(0, internal_id.indexOf(":")); - let terminate_service_client_process = false; if (service_source[service_id] === undefined) { service_source[service_id] = wrt.readService(internal_id); - terminate_service_client_process = true; } vm.runInNewContext(service_source[service_id], sandbox[internal_id], options); - - if (terminate_service_client_process) { - if (!wrt.terminateServiceClientProcess(internal_id)) { - console.log('Failed to terminate client process'); - } - } } if (sandbox[internal_id]['started'] === undefined) { sandbox[internal_id]['started'] = true;