X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fpm_wrapper.cpp;h=f0efcac3cdce2ea441bea4169e50e42d11f6c59d;hb=0b2c927e6606c0fbae889fea7085a9af12d15714;hp=69b6a16577e40e3d69ac755faf6a3488b759b730;hpb=58da0c77b98af1b771e4af28b42d0a3ddec09877;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/pm_wrapper.cpp b/src/pm_wrapper.cpp
index 69b6a16..f0efcac 100644
--- a/src/pm_wrapper.cpp
+++ b/src/pm_wrapper.cpp
@@ -33,7 +33,7 @@ static void onStateTransitioned(json_object *json_out)
 
 static void onError(json_object *json_out)
 {
-    HMI_DEBUG("wm", "error message from PolicyManager:%s",
+    HMI_DEBUG("error message from PolicyManager:%s",
               json_object_get_string(json_out));
 
     g_context->processError();
@@ -125,7 +125,7 @@ void PMWrapper::updateStates(json_object *json_out)
 {
     std::vector<WMAction> actions;
 
-    HMI_DEBUG("wm", "json_out dump:%s", json_object_get_string(json_out));
+    HMI_DEBUG("json_out dump:%s", json_object_get_string(json_out));
 
     this->createLayoutChangeAction(json_out, actions);
 
@@ -138,12 +138,12 @@ void PMWrapper::createLayoutChangeAction(json_object *json_out, std::vector<WMAc
     json_object *json_layers;
     if (!json_object_object_get_ex(json_out, "layers", &json_layers))
     {
-        HMI_DEBUG("wm", "Not found key \"layers\"");
+        HMI_DEBUG("Not found key \"layers\"");
         return;
     }
 
     int len = json_object_array_length(json_layers);
-    HMI_DEBUG("wm", "json_layers len:%d", len);
+    HMI_DEBUG("json_layers len:%d", len);
 
     for (int i = 0; i < len; i++)
     {
@@ -151,19 +151,19 @@ void PMWrapper::createLayoutChangeAction(json_object *json_out, std::vector<WMAc
 
         std::string layer_name = jh::getStringFromJson(json_tmp, "name");
         json_bool changed = jh::getBoolFromJson(json_tmp, "changed");
-        HMI_DEBUG("wm", "layer:%s changed:%d", layer_name.c_str(), changed);
+        HMI_DEBUG("layer:%s changed:%d", layer_name.c_str(), changed);
 
         if (changed)
         {
             json_object *json_areas;
             if (!json_object_object_get_ex(json_tmp, "areas", &json_areas))
             {
-                HMI_DEBUG("wm", "Not found key \"areas\"");
+                HMI_DEBUG("Not found key \"areas\"");
                 return;
             }
 
             int len = json_object_array_length(json_areas);
-            HMI_DEBUG("wm", "json_layers len:%d", len);
+            HMI_DEBUG("json_layers len:%d", len);
 
             // Store previous role state in this layer
             this->prvlayer2rolestate[layer_name] = this->crrlayer2rolestate[layer_name];
@@ -180,19 +180,20 @@ void PMWrapper::createLayoutChangeAction(json_object *json_out, std::vector<WMAc
                 crr_roles[role_name] = area_name;
 
                 auto i_prv = prv_roles.find(role_name);
-                HMI_DEBUG("wm", "current role:%s area:%s",
+                HMI_DEBUG("current role:%s area:%s",
                           role_name.c_str(), area_name.c_str());
 
                 // If current role does not exist in previous
                 if (prv_roles.end() == i_prv)
                 {
-                    HMI_DEBUG("wm", "current role does not exist in previous");
+                    HMI_DEBUG("current role does not exist in previous");
 
                     // Set activate action
                     bool end_draw_finished = false;
                     WMAction act
                     {
-                        "",
+                        0,
+                        nullptr,
                         role_name,
                         area_name,
                         TaskVisible::VISIBLE,
@@ -202,19 +203,20 @@ void PMWrapper::createLayoutChangeAction(json_object *json_out, std::vector<WMAc
                 }
                 else
                 {
-                    HMI_DEBUG("wm", "previous role:%s area:%s",
+                    HMI_DEBUG("previous role:%s area:%s",
                               i_prv->first.c_str(), i_prv->second.c_str());
 
                     // If current role exists in previous and area is different with previous
                     if (area_name != i_prv->second)
                     {
-                        HMI_DEBUG("wm", "current role exists in previous and area is different with previous");
+                        HMI_DEBUG("current role exists in previous and area is different with previous");
 
                         // Set activate action
                         bool end_draw_finished = false;
                         WMAction act
                         {
-                            "",
+                            0,
+                            nullptr,
                             role_name,
                             area_name,
                             TaskVisible::VISIBLE,
@@ -232,13 +234,14 @@ void PMWrapper::createLayoutChangeAction(json_object *json_out, std::vector<WMAc
             // because these are not displayed in current layout
             for (auto i_prv : prv_roles)
             {
-                HMI_DEBUG("wm", "Deactivate role:%s", i_prv.first.c_str());
+                HMI_DEBUG("Deactivate role:%s", i_prv.first.c_str());
 
                 // Set deactivate action
                 bool end_draw_finished = true;
                 WMAction act
                 {
-                    "",
+                    0,
+                    nullptr,
                     i_prv.first,
                     "",
                     TaskVisible::INVISIBLE,