diff options
Diffstat (limited to 'src/policy_manager/policy_manager.cpp')
| -rw-r--r-- | src/policy_manager/policy_manager.cpp | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/policy_manager/policy_manager.cpp b/src/policy_manager/policy_manager.cpp index 9ece573..3b0eac6 100644 --- a/src/policy_manager/policy_manager.cpp +++ b/src/policy_manager/policy_manager.cpp @@ -68,9 +68,8 @@ int PolicyManager::initialize() { return ret; } - // TODO: // Initialize StateTransitioner - // stmInitialize(); + stm::stmInitialize(); return ret; } @@ -123,7 +122,7 @@ int PolicyManager::checkPolicy(json_object* json_in, json_object** json_out) { // Transition state HMI_DEBUG("wm:pm", "set event:0x%x", (event_no | category_no | area_no)); - int ret = stmTransitionState((event_no | category_no | area_no), + int ret = stm::stmTransitionState((event_no | category_no | area_no), &(this->current_state_)); if (0 > ret) { HMI_ERROR("wm:pm", "Error!!"); @@ -187,6 +186,19 @@ int PolicyManager::checkPolicy(json_object* json_in, json_object** json_out) { json_object_array_add(json_layer, json_tmp); // { + // "restriction": { + // "is_changed": <bool>, + // "state": <const char*> + // } + // }, + json_tmp = json_object_new_object(); + this->addStateToJson("restriction", + this->current_state_.layer.restriction.is_changed, + stm::gStmLayoutNo2Name[this->current_state_.layer.restriction.state], + &json_tmp); + json_object_array_add(json_layer, json_tmp); + + // { // "apps": { // "is_changed": <bool>, // "state": <const char*> @@ -217,8 +229,6 @@ int PolicyManager::checkPolicy(json_object* json_in, json_object** json_out) { // Add json array of layer json_object_object_add(*json_out, "layers", json_layer); - HMI_DEBUG("wm:pm", "json_out.dump:%s", json_object_get_string(*json_out)); - return 0; } |