Update windowmanager

Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>

diff --git a/src/window_manager.cpp b/src/window_manager.cpp
index 95b0d5a..34115f7 100644 (file)
--- a/src/window_manager.cpp
+++ b/src/window_manager.cpp
@@ -270,6 +270,8 @@ result<int> WindowManager::api_request_surface(char const *appid, char const *dr
         }
     }
 
+    this->lc->createNewLayer(l_id);
+
     // generate surface ID for ivi-shell application
 
     auto rname = this->id_alloc.lookup(string(role));
@@ -336,6 +338,8 @@ char const *WindowManager::api_request_surface(char const *appid, char const *dr
         }
     }
 
+    this->lc->createNewLayer(lid);
+
     auto rname = this->id_alloc.lookup(str);
 
     if (rname)
@@ -503,7 +507,7 @@ void WindowManager::api_activate_surface(char const *appid, char const *drawing_
     /*
      * Do allocate tasks
      */
-    ret = this->doTransition(req_num);
+    ret = this->checkPolicy(req_num);
 
     if (ret != WMError::SUCCESS)
     {
@@ -555,7 +559,7 @@ void WindowManager::api_deactivate_surface(char const *appid, char const *drawin
     /*
     * Do allocate tasks
     */
-    ret = this->doTransition(req_num);
+    ret = this->checkPolicy(req_num);
 
     if (ret != WMError::SUCCESS)
     {
@@ -1188,13 +1192,6 @@ WMError WindowManager::setRequest(const string& appid, const string &role, const
     return WMError::SUCCESS;
 }
 
-WMError WindowManager::doTransition(unsigned req_num)
-{
-    HMI_SEQ_DEBUG(req_num, "check policy");
-    WMError ret = this->checkPolicy(req_num);
-    return ret;
-}
-
 WMError WindowManager::checkPolicy(unsigned req_num)
 {
     /*
@@ -1483,7 +1480,7 @@ void WindowManager::processNextRequest()
     if (g_app_list.haveRequest())
     {
         HMI_SEQ_DEBUG(req_num, "Process next request");
-        WMError rc = doTransition(req_num);
+        WMError rc = checkPolicy(req_num);
         if (rc != WMError::SUCCESS)
         {
             HMI_SEQ_ERROR(req_num, errorDescription(rc));

diff --git a/src/window_manager.hpp b/src/window_manager.hpp
index dc97871..f3b3c64 100644 (file)
--- a/src/window_manager.hpp
+++ b/src/window_manager.hpp
@@ -235,7 +235,6 @@ class WindowManager
     void deactivate(int id);
     WMError setRequest(const std::string &appid, const std::string &role, const std::string &area,
                              Task task, unsigned *req_num);
-    WMError doTransition(unsigned sequence_number);
     WMError checkPolicy(unsigned req_num);
     WMError startTransition(unsigned req_num);