fix for als2019 8.0.0 sandbox/zheng_wenlong/als2019
authorzheng_wenlong <wenlong_zheng@nexty-ele.com>
Fri, 2 Aug 2019 06:37:49 +0000 (15:37 +0900)
committerzheng_wenlong <wenlong_zheng@nexty-ele.com>
Fri, 2 Aug 2019 06:37:49 +0000 (15:37 +0900)
package/root/config.xml
src/window_manager.cpp

index e11ef63..d15750b 100644 (file)
@@ -8,12 +8,12 @@
   <feature name="urn:AGL:widget:required-permission">
     <param name="urn:AGL:permission::public:hidden" value="required" />
     <param name="urn:AGL:permission::system:run-by-default" value="required" />
-    <param name="urn:AGL:permission:afm:system:runner" value="required" />
+    <param name="urn:AGL:permission::public:display" value="required" />
   </feature>
   <feature name="urn:AGL:widget:provided-api">
      <param name="windowmanager" value="ws" />
   </feature>
-  <feature name="urn:AGL:widget:required-api">
+  <feature name="urn:AGL:widget:required-binding">
     <param name="low-can" value="ws" />
     <param name="lib/windowmanager-service.so" value="local" />
     <param name="afm-main" value="ws" />
index 6955131..52a7144 100644 (file)
@@ -529,7 +529,6 @@ void WindowManager::api_activate_window(char const *appid, char const *drawing_n
     // g_app_list.removeFloatingSurface(client);i
     unsigned layer = client->layerID();
 
-#if 0
     //TODO  Deactivate remote viewing app for remote view change to local view.
     if(this->lc->hasRemoteLayer(layer) != "" && this->wmcon.getAppIdToEcuName(appid) != "")
     {
@@ -558,7 +557,6 @@ void WindowManager::api_activate_window(char const *appid, char const *drawing_n
         this->emit_invisible(role);
         this->emit_deactivated(role);
     }
-#endif
 
     Task task = Task::TASK_ALLOCATE;
     unsigned req_num = 0;
@@ -694,7 +692,7 @@ void WindowManager::api_activate_surface_to_master(
     // g_app_list.removeFloatingSurface(client);
 
     unsigned layer = client->layerID();
-#if 0
+
     //TODO  Deactivate remote viewing app for remote view change to local view.
     if(this->lc->hasRemoteLayer(layer) != "" && this->wmcon.getAppIdToEcuName(appid) != "")
     {
@@ -723,7 +721,7 @@ void WindowManager::api_activate_surface_to_master(
         this->emit_invisible(role);
         this->emit_deactivated(role);
     }
-#endif
+
     Task task = Task::TASK_ALLOCATE;
     unsigned req_num = 0;
     WMError ret = WMError::UNKNOWN;