2 files changed, 44 insertions, 50 deletions

diff --git a/src/policy_manager/policy_manager.cpp b/src/policy_manager/policy_manager.cpp
index 8b902b2..20c1e79 100644
--- a/src/policy_manager/policy_manager.cpp
+++ b/src/policy_manager/policy_manager.cpp
@@ -20,12 +20,13 @@
 #include <istream>
 #include <json-c/json.h>
 #include "policy_manager.hpp"
-#if 0
+#include "hmi-debug.h"
+
+namespace stm {
 extern "C" {
 #include "dummy_stm.h"
 }
-#endif
-#include "hmi-debug.h"
+} // namespace stm
 
 
 PolicyManager::PolicyManager() :
@@ -34,8 +35,7 @@ PolicyManager::PolicyManager() :
   areaname2no_(),
   role2category_(),
   category2role_(),
-  role2defaultarea_(),
-  current_state_()
+  role2defaultarea_()
 {
     HMI_DEBUG("wm:pm", "Call");
 }
@@ -120,10 +120,11 @@ int PolicyManager::checkPolicy(json_object* json_in, json_object** json_out) {
         HMI_DEBUG("wm:pm", "area(%s:%d)", area, area_no);
     }
 
-    // Transition state
     HMI_DEBUG("wm:pm", "set event:0x%x", (event_no | category_no | area_no));
-    int ret = stm::stmTransitionState((event_no | category_no | area_no),
-                                       &(this->current_state_));
+
+    // Transition state
+    stm::stm_state_t crr_state;
+    int ret = stm::stmTransitionState((event_no | category_no | area_no), &crr_state);
     if (0 > ret) {
         HMI_ERROR("wm:pm", "Error!!");
         return -1;
@@ -136,12 +137,12 @@ int PolicyManager::checkPolicy(json_object* json_in, json_object** json_out) {
     //         "state": <const char*>
     //     },
     HMI_DEBUG("wm", "parking brake state (is_changed:%d state:%d:%s)",
-              this->current_state_.parking_brake.is_changed,
-              this->current_state_.parking_brake.state,
-              stm::gStmParkingBrakeStateNo2Name[this->current_state_.parking_brake.state]);
+              crr_state.parking_brake.is_changed,
+              crr_state.parking_brake.state,
+              stm::gStmParkingBrakeStateNo2Name[crr_state.parking_brake.state]);
     this->addStateToJson("parking_brake",
-                         this->current_state_.parking_brake.is_changed,
-                         stm::gStmParkingBrakeStateNo2Name[this->current_state_.parking_brake.state],
+                         crr_state.parking_brake.is_changed,
+                         stm::gStmParkingBrakeStateNo2Name[crr_state.parking_brake.state],
                          json_out);
 
     //     "car": {
@@ -149,12 +150,12 @@ int PolicyManager::checkPolicy(json_object* json_in, json_object** json_out) {
     //         "state": <const char*>
     //     },
     HMI_DEBUG("wm", "car state (is_changed:%d state:%d:%s)",
-              this->current_state_.car.is_changed,
-              this->current_state_.car.state,
-              stm::gStmCarStateNo2Name[this->current_state_.car.state]);
+              crr_state.car.is_changed,
+              crr_state.car.state,
+              stm::gStmCarStateNo2Name[crr_state.car.state]);
     this->addStateToJson("car",
-                         this->current_state_.car.is_changed,
-                         stm::gStmCarStateNo2Name[this->current_state_.car.state],
+                         crr_state.car.is_changed,
+                         stm::gStmCarStateNo2Name[crr_state.car.state],
                          json_out);
 
     //     "lamp": {
@@ -162,12 +163,12 @@ int PolicyManager::checkPolicy(json_object* json_in, json_object** json_out) {
     //         "state": <const char*>
     //     },
     HMI_DEBUG("wm", "lamp state (is_changed:%d state:%d:%s)",
-              this->current_state_.lamp.is_changed,
-              this->current_state_.lamp.state,
-              stm::gStmLampStateNo2Name[this->current_state_.lamp.state]);
+              crr_state.lamp.is_changed,
+              crr_state.lamp.state,
+              stm::gStmLampStateNo2Name[crr_state.lamp.state]);
     this->addStateToJson("lamp",
-                         this->current_state_.lamp.is_changed,
-                         stm::gStmLampStateNo2Name[this->current_state_.lamp.state],
+                         crr_state.lamp.is_changed,
+                         stm::gStmLampStateNo2Name[crr_state.lamp.state],
                          json_out);
 
     //     "layers": [
@@ -180,12 +181,12 @@ int PolicyManager::checkPolicy(json_object* json_in, json_object** json_out) {
     json_object* json_layer = json_object_new_array();
     json_object* json_tmp = json_object_new_object();
     HMI_DEBUG("wm", "on_screen state (is_changed:%d state:%d:%s)",
-              this->current_state_.layer.on_screen.is_changed,
-              this->current_state_.layer.on_screen.state,
-              stm::gStmLayoutNo2Name[this->current_state_.layer.on_screen.state]);
+              crr_state.layer.on_screen.is_changed,
+              crr_state.layer.on_screen.state,
+              stm::gStmLayoutNo2Name[crr_state.layer.on_screen.state]);
     this->addStateToJson("on_screen",
-                         this->current_state_.layer.on_screen.is_changed,
-                         stm::gStmLayoutNo2Name[this->current_state_.layer.on_screen.state],
+                         crr_state.layer.on_screen.is_changed,
+                         stm::gStmLayoutNo2Name[crr_state.layer.on_screen.state],
                          &json_tmp);
     json_object_array_add(json_layer, json_tmp);
 
@@ -196,13 +197,13 @@ int PolicyManager::checkPolicy(json_object* json_in, json_object** json_out) {
     //             }
     //         },
     HMI_DEBUG("wm", "restriction state (is_changed:%d state:%d:%s)",
-              this->current_state_.layer.restriction.is_changed,
-              this->current_state_.layer.restriction.state,
-              stm::gStmLayoutNo2Name[this->current_state_.layer.restriction.state]);
+              crr_state.layer.restriction.is_changed,
+              crr_state.layer.restriction.state,
+              stm::gStmLayoutNo2Name[crr_state.layer.restriction.state]);
     json_tmp = json_object_new_object();
     this->addStateToJson("restriction",
-                         this->current_state_.layer.restriction.is_changed,
-                         stm::gStmLayoutNo2Name[this->current_state_.layer.restriction.state],
+                         crr_state.layer.restriction.is_changed,
+                         stm::gStmLayoutNo2Name[crr_state.layer.restriction.state],
                          &json_tmp);
     json_object_array_add(json_layer, json_tmp);
 
@@ -213,13 +214,13 @@ int PolicyManager::checkPolicy(json_object* json_in, json_object** json_out) {
     //             }
     //         },
     HMI_DEBUG("wm", "apps state (is_changed:%d state:%d:%s)",
-              this->current_state_.layer.apps.is_changed,
-              this->current_state_.layer.apps.state,
-              stm::gStmLayoutNo2Name[this->current_state_.layer.apps.state]);
+              crr_state.layer.apps.is_changed,
+              crr_state.layer.apps.state,
+              stm::gStmLayoutNo2Name[crr_state.layer.apps.state]);
     json_tmp = json_object_new_object();
     this->addStateToJson("apps",
-                         this->current_state_.layer.apps.is_changed,
-                         stm::gStmLayoutNo2Name[this->current_state_.layer.apps.state],
+                         crr_state.layer.apps.is_changed,
+                         stm::gStmLayoutNo2Name[crr_state.layer.apps.state],
                          &json_tmp);
     json_object_array_add(json_layer, json_tmp);
 
@@ -232,13 +233,13 @@ int PolicyManager::checkPolicy(json_object* json_in, json_object** json_out) {
     //     ]
     // }
     HMI_DEBUG("wm", "homescreen state (is_changed:%d state:%d:%s)",
-              this->current_state_.layer.homescreen.is_changed,
-              this->current_state_.layer.homescreen.state,
-              stm::gStmLayoutNo2Name[this->current_state_.layer.homescreen.state]);
+              crr_state.layer.homescreen.is_changed,
+              crr_state.layer.homescreen.state,
+              stm::gStmLayoutNo2Name[crr_state.layer.homescreen.state]);
     json_tmp = json_object_new_object();
     this->addStateToJson("homescreen",
-                         this->current_state_.layer.homescreen.is_changed,
-                         stm::gStmLayoutNo2Name[this->current_state_.layer.homescreen.state],
+                         crr_state.layer.homescreen.is_changed,
+                         stm::gStmLayoutNo2Name[crr_state.layer.homescreen.state],
                          &json_tmp);
     json_object_array_add(json_layer, json_tmp);
 
diff --git a/src/policy_manager/policy_manager.hpp b/src/policy_manager/policy_manager.hpp
index b191b10..787a3ec 100644
--- a/src/policy_manager/policy_manager.hpp
+++ b/src/policy_manager/policy_manager.hpp
@@ -21,11 +21,6 @@
 #include <unordered_map>
 #include <vector>
 
-namespace stm {
-extern "C" {
-#include "dummy_stm.h"
-}
-} // namespace stm
 
 struct json_object;
 
@@ -54,8 +49,6 @@ private:
     std::unordered_map<std::string, std::string> category2role_;
     std::unordered_map<std::string, std::string> role2defaultarea_;
 
-    stm::stm_state_t current_state_;
-
     // Load role.db
     int loadRoleDb();