X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayout_manager%2Flayout.cpp;h=faab3160c2b2741668148c7f9020d377383861b9;hb=3a3f1ddf5c67403d61341034d5d189d13a900474;hp=3f4013e1c09e6ce901c580e819299332c71b7087;hpb=273f15d6f5368a0144ea84cfdcf03f9d985106f5;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/layout_manager/layout.cpp b/src/layout_manager/layout.cpp
index 3f4013e..faab316 100644
--- a/src/layout_manager/layout.cpp
+++ b/src/layout_manager/layout.cpp
@@ -104,7 +104,7 @@ bool LayoutManager::updateLayout(json_object* obj,
         json_object_object_foreach(json_tmp, key, val) {
             layer = key;
             json_layer = val;
-            HMI_DEBUG("wm:lm", "Update %s layer state", layer);
+            HMI_DEBUG("wm:lm", "Try to update %s layer state", layer);
         }
 
         // Store previous state
@@ -253,6 +253,7 @@ bool LayoutManager::isLayoutChanged(const char* layer) {
     return this->is_layout_changed_[layer];
 }
 
+
 extern const char* kDefaultLayoutDb;
 int LayoutManager::loadLayoutDb() {
     HMI_DEBUG("wm:lm", "Call");
@@ -270,10 +271,10 @@ int LayoutManager::loadLayoutDb() {
     }
 
     // Load layout.db
-    HMI_DEBUG("wm:lm", "file_name:%s", file_name.c_str());
-    json_object* json_obj = json_object_from_file(file_name.c_str());
-    if (nullptr == json_obj) {
-        HMI_ERROR("wm:lm", "Could not open layout.db, so use default role information");
+    json_object* json_obj;
+    int ret = jh::inputJsonFilie(file_name.c_str(), &json_obj);
+    if (0 > ret) {
+        HMI_DEBUG("wm:lm", "Could not open layout.db, so use default layout information");
         json_obj = json_tokener_parse(kDefaultLayoutDb);
     }
     HMI_DEBUG("wm:lm", "json_obj dump:%s", json_object_get_string(json_obj));