Update the dbus exception error handling

Change-Id: I007b4fcac1af21256743716a51eefc8068cfd623

diff --git a/packaging/mm-resource-manager.spec b/packaging/mm-resource-manager.spec
index 02ab0e9..49f6519 100644 (file)
--- a/packaging/mm-resource-manager.spec
+++ b/packaging/mm-resource-manager.spec
@@ -1,6 +1,6 @@
 Name:       mm-resource-manager
 Summary:    A Multimedia Resource Manager API
-Version:    0.2.20
+Version:    0.2.21
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/daemon/mm_resource_manager_daemon_conf.c b/src/daemon/mm_resource_manager_daemon_conf.c
index c650c83..562109a 100644 (file)
--- a/src/daemon/mm_resource_manager_daemon_conf.c
+++ b/src/daemon/mm_resource_manager_daemon_conf.c
@@ -62,7 +62,8 @@ gboolean mm_resource_manager_reload_conf(void)
                                _mm_resource_manager_get_res_str(i))->str,
                                MM_RESOURCE_MANAGER_NO_RES);
                if (mm_resource_manager_conf.max_volume[i] >= 1) {
-                       mm_resource_manager_conf.volume_would_be_checked[i] = TRUE;
+                       if (mm_resource_manager_conf.max_volume[i] > 1)
+                               mm_resource_manager_conf.volume_would_be_checked[i] = TRUE;
                        for (j = 0; j < MM_RESOURCE_MANAGER_RES_TYPE_COND_MAX; j++) {
                                g_string_printf(param_name, "%s:%s",
                                                _mm_resource_manager_get_res_str(i),

diff --git a/src/daemon/mm_resource_manager_daemon_priv.c b/src/daemon/mm_resource_manager_daemon_priv.c
index c866dc2..4b52734 100644 (file)
--- a/src/daemon/mm_resource_manager_daemon_priv.c
+++ b/src/daemon/mm_resource_manager_daemon_priv.c
@@ -576,7 +576,7 @@ static GArray *__handle_acquire_requests(mm_resource_manager_dmn_p manager,
                                }
                        }
                } else {
-                       MM_RM_INFO("[managers len #%d] [%d type #%d (max #%d)] [%d (max %d) units of %s] are requested",
+                       MM_RM_INFO("[managers len #%d] [%d type #%d (max inst #%d)] [%d (max vol %d) units of %s] are requested",
                                managers->len, type, res_count[type] + 1,
                                conf->max_instance[type], volume, conf->max_volume[type], res_name);
 

diff --git a/src/lib/mm_resource_manager_priv.c b/src/lib/mm_resource_manager_priv.c
index a3633d3..caf78d9 100644 (file)
--- a/src/lib/mm_resource_manager_priv.c
+++ b/src/lib/mm_resource_manager_priv.c
@@ -584,9 +584,7 @@ static int __check_resource(mm_resource_manager_s *rm,
        mm_resource_manager_res_p i_res;
        int i;
 
-       MM_RM_RETVM_IF(remaining_local_volume == MM_RESOURCE_MANAGER_NO_RES,
-                       MM_RESOURCE_MANAGER_ERROR_NOT_SUPPORTED,
-                       "No resource for the platform");
+       MM_RM_INFO("[#%"PRIu64" type : %d] resource (#%d) for the platform", _mm_rm_hash64(rm->id), type, remaining_local_volume);
 
        if (volume > 0) {
                for (i = 0; i < rm->resources->len; i++) {
@@ -770,7 +768,10 @@ static int __dbus_init_conf(mm_resource_manager_s *handle)
                        MM_RESOURCE_MANAGER_ERROR_INVALID_OPERATION, "Variant data are empty");
 
        if (g_variant_iter_init(&volume_iter, max_volume) == MM_RESOURCE_MANAGER_RES_TYPE_MAX) {
-               for (i = 0; g_variant_iter_next(&volume_iter, "i", &handle->__max_resource_volumes[i]); i++);
+               for (i = 0; g_variant_iter_next(&volume_iter, "i", &handle->__max_resource_volumes[i]); i++) {
+                       if (handle->__max_resource_volumes[i] == MM_RESOURCE_MANAGER_NO_RES)
+                               MM_RM_INFO("Maybe occur the  error operation related dbus");
+               }
                g_variant_unref(max_volume);
                max_volume = NULL;
        } else {