Prevent unnecessary xwalk extension loading for UI service

Remove xwalk extension loading in main thread if UI service is launched.

Change-Id: I122de3061759cf1c00bd2d93dc2d8ae46aff5367
Signed-off-by: SangYong Park <sy302.park@samsung.com>

diff --git a/wrt_app/service/service_manager.ts b/wrt_app/service/service_manager.ts
index a4d33fe4134f7b9f5233910847fbdf7700b8181e..c74728e6b755fd62f4c2293438c5bdaf804f8111 100644 (file)
--- a/wrt_app/service/service_manager.ts
+++ b/wrt_app/service/service_manager.ts
@@ -118,18 +118,23 @@ function terminateWorker(id: string, delay: number) {
 
 let initializeExtensionOnMain = (id: string) => {
   initializeExtensionOnMain = (id: string) => {};
+
+  const serviceType = global['serviceType'];
+  if (serviceType === 'UI')
+    return;
+
   XWalkExtension.initialize();
   // This is workaround solution to make webapis's singleton worker, which has
   // same smack label with pid's.
   // It must be handled ahead of dropThreadPrivilege()
   // Otherwise, smack violation might hanppen from 'libdbuspolicy'.
   global.tizen.systeminfo.getPropertyValue('CPU', () => { }, () => { });
-  if (global['serviceType'] === 'STANDALONE') {
+  if (serviceType === 'STANDALONE') {
     let ids = id.split(':');
     let serviceId = ids[0];
     let packageId = serviceId.split('.')[0];
     wrt.security?.dropThreadPrivilege(packageId, serviceId);
-  } else if (global['serviceType'] === 'GLOBAL') {
+  } else if (serviceType === 'GLOBAL') {
     global.tizen.alarm.getAll();
   }
 }

diff --git a/wrt_app/service/service_runner.ts b/wrt_app/service/service_runner.ts
index 814de69c880c641629a95001b5d3ebf612871b2f..b5b87fc46995c5c1a87dd2646c26bf244c6281e7 100644 (file)
--- a/wrt_app/service/service_runner.ts
+++ b/wrt_app/service/service_runner.ts
@@ -69,7 +69,8 @@ let checkLauncherAlive = (id: string) => {
 }
 
 export function start(id: string, filename: string) {
-  if (isServiceApplication()) {
+  const isInServiceProcess = isServiceApplication();
+  if (isInServiceProcess) {
     let ids = id.split(':');
     let serviceId = ids[0];
     let packageId = wrt.getPackageId(id);
@@ -94,7 +95,8 @@ export function start(id: string, filename: string) {
   });
 
   console.debug(`serviceType : ${global['serviceType']}`)
-  deviceApiRouter = new DeviceAPIRouter(id, isGlobalService());
+  if (isInServiceProcess)
+    deviceApiRouter = new DeviceAPIRouter(id, isGlobalService());
   printAppControlData(id);
   ServiceMessage.initConsoleMessageNotification(id);