Move process for deciding area when correct area is not set

Change-Id: I6ca3751e0a02ba62a66e770572e86da321ce2e5d
Signed-off-by: Yuta Doi <yuta-d@witz-inc.co.jp>

1 files changed, 6 insertions, 6 deletions

diff --git a/src/policy_manager/policy_manager.cpp b/src/policy_manager/policy_manager.cpp
index 62b73e9..ebc45a9 100644
--- a/src/policy_manager/policy_manager.cpp
+++ b/src/policy_manager/policy_manager.cpp
@@ -770,13 +770,13 @@ int PolicyManager::setInputEventData(json_object* json_in) {
             area_no = this->areaname2no[area];
             HMI_DEBUG("wm:pm", "area(%s:%d)", area, area_no);
         }
-        else {
-            HMI_ERROR("wm:pm", "Invalid area name!!");
-        }
     }
-    else if (0 != strcmp("", role)) {
-        area_no = this->areaname2no[this->role2defaultarea[role]];
-        HMI_DEBUG("wm:pm", "area(%s:%d)", this->role2defaultarea[role].c_str(), area_no);
+
+    // If role is set and area is not set, use default area
+    if ((nullptr == area) && (0 != strcmp("", role))) {
+        std::string def_area = this->role2defaultarea[role];
+        area_no = this->areaname2no[def_area];
+        HMI_DEBUG("wm:pm", "area(%s:%d)", def_area.c_str(), area_no);
     }
 
     // Set event info to the queue