diff options
| author |   zheng_wenlong <wenlong_zheng@nexty-ele.com> | 2019-08-02 15:37:49 +0900 |
|---|---|---|
| committer | zheng_wenlong <wenlong_zheng@nexty-ele.com> | 2019-08-02 15:37:49 +0900 |
| commit | f7536d2b6ff552e7c4849b36d9b6e140c5b1b9aa (patch) | |
| tree | ce592ba2b799b77b55bab7df86e29f2ff158c386 | |
| parent | c7e9f1482ef0506c91d2a1567d7cb19f7def62d3 (diff) | |
fix for als2019 8.0.0sandbox/zheng_wenlong/als2019
| -rw-r--r-- | package/root/config.xml | 4 | ||||
| -rw-r--r-- | src/window_manager.cpp | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/package/root/config.xml b/package/root/config.xml index e11ef63..d15750b 100644 --- a/package/root/config.xml +++ b/package/root/config.xml @@ -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" /> diff --git a/src/window_manager.cpp b/src/window_manager.cpp index 6955131..52a7144 100644 --- a/src/window_manager.cpp +++ b/src/window_manager.cpp @@ -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; |