Remove unnecessary code

[apps/agl-service-windowmanager.git] / src / policy_manager / policy_manager.cpp

diff --git a/src/policy_manager/policy_manager.cpp b/src/policy_manager/policy_manager.cpp
index bc3fd8d..0f7dc27 100644 (file)
--- a/src/policy_manager/policy_manager.cpp
+++ b/src/policy_manager/policy_manager.cpp
@@ -89,7 +89,7 @@ int PolicyManager::initialize() {
     int ret = 0;
 
     // Create convert map
-    for (unsigned int i=0; i<STM_NUM_EVT; i++) {
+    for (int i = stm::gStmEventNoMin; i <= stm::gStmEventNoMax; i++) {
         HMI_DEBUG("wm:pm", "event name:%s no:%d", stm::gStmEventName[i], stm::gStmEventNo[i]);
         this->eventname2no_[stm::gStmEventName[i]] = stm::gStmEventNo[i];
     }
@@ -99,7 +99,7 @@ int PolicyManager::initialize() {
         this->categoryname2no_[stm::gStmCategoryName[i]] = stm::gStmCategoryNo[i];
     }
 
-    for (unsigned int i=0; i<STM_NUM_ARA; i++) {
+    for (int i = stm::gStmAreaNoMin; i <= stm::gStmAreaNoMax; i++) {
         HMI_DEBUG("wm:pm", "area name:%s no:%d", stm::gStmAreaName[i], stm::gStmAreaNo[i]);
         this->areaname2no_[stm::gStmAreaName[i]] = stm::gStmAreaNo[i];
     }
@@ -203,7 +203,6 @@ static void addStateToJson(const char* layer_name, unsigned int changed,
     json_object_object_add(*json_out, "areas", json_areas);
 }
 
-
 static int checkPolicyEntry(int event, uint64_t delay_ms, std::string role);
 static int checkPolicy(sd_event_source *source, void *data) {
     HMI_DEBUG("wm:pm", "Call");
@@ -579,11 +578,11 @@ static int checkPolicy(sd_event_source *source, void *data) {
     if (crr_state.car.is_changed) {
         if (stm::gStmCarStateNoRun == crr_state.car.state) {
             // Set delay event(restriction mode on)
-            checkPolicyEntry(STM_EVT_NO_RESTRICTION_MODE_ON, 3000, nullptr);
+            checkPolicyEntry(STM_EVT_NO_RESTRICTION_MODE_ON, 3000, "");
         }
         else if (stm::gStmCarStateNoStop == crr_state.car.state) {
             // Set event(restriction mode off)
-            checkPolicyEntry(STM_EVT_NO_RESTRICTION_MODE_OFF, 0, nullptr);
+            checkPolicyEntry(STM_EVT_NO_RESTRICTION_MODE_OFF, 0, "");
 
             // Stop timer for restriction on event
             if (pm::event_source_list.find(STM_EVT_NO_RESTRICTION_MODE_ON)
@@ -730,7 +729,6 @@ int PolicyManager::setInputEventData(json_object* json_in) {
     else {
         event_info.role = std::string(role);
     }
-    event_info.role = std::string(role);
     event_info.delay = 0;
     pm::g_event_info_queue.push(event_info);
 
@@ -982,13 +980,6 @@ int PolicyManager::loadLayoutDb() {
             HMI_DEBUG("wm:pm", ">>> >>> area    :%s", itr_area->name.c_str());
             HMI_DEBUG("wm:pm", ">>> >>> category:%s", itr_area->category.c_str());
             HMI_DEBUG("wm:pm", ">>> >>> role    :%s", itr_area->role.c_str());
-#if 0
-            for (auto itr_role = itr_area->second.begin();
-              itr_role != itr_area->second.end(); ++itr_role) {
-                HMI_DEBUG("wm:pm", ">>> >>> >>> attribute:%s, name:%s",
-                          itr_role->first.c_str(), itr_role->second.c_str());
-            }
-#endif
         }
     }