Merge "Add the exception case for audio initialize" into tizen

diff --git a/bt-oal/bluez_hal/src/bt-hal-a2dp-sink-dbus-handler.c b/bt-oal/bluez_hal/src/bt-hal-a2dp-sink-dbus-handler.c
index a507a66..e64f19a 100644 (file)
--- a/bt-oal/bluez_hal/src/bt-hal-a2dp-sink-dbus-handler.c
+++ b/bt-oal/bluez_hal/src/bt-hal-a2dp-sink-dbus-handler.c
@@ -266,7 +266,16 @@ bt_status_t _bt_hal_dbus_handler_enable_a2dp_sink(void)
        if (ret == NULL) {
                ERR("Call SelectRole Failed");
                if (error) {
-                       ERR("errCode[%x], message[%s]", error->code, error->message);
+                       g_dbus_error_strip_remote_error(error);
+
+                       ERR("message[%s]", error->message);
+
+                       /* Add the exception case for Already Exists */
+                       if (g_strrstr(error->message, "Already Exists")) {
+                               g_clear_error(&error);
+                               return BT_STATUS_SUCCESS;
+                       }
+
                        g_clear_error(&error);
                }
                return BT_STATUS_FAIL;

diff --git a/bt-oal/bluez_hal/src/bt-hal-av-dbus-handler.c b/bt-oal/bluez_hal/src/bt-hal-av-dbus-handler.c
index 847c55e..2e53a49 100644 (file)
--- a/bt-oal/bluez_hal/src/bt-hal-av-dbus-handler.c
+++ b/bt-oal/bluez_hal/src/bt-hal-av-dbus-handler.c
@@ -266,7 +266,16 @@ bt_status_t _bt_hal_dbus_handler_enable_a2dp_source(void)
        if (ret == NULL) {
                ERR("Call SelectRole Failed");
                if (error) {
-                       ERR("errCode[%x], message[%s]", error->code, error->message);
+                       g_dbus_error_strip_remote_error(error);
+
+                       ERR("message[%s]", error->message);
+
+                       /* Add the exception case for Already Exists */
+                       if (g_strrstr(error->message, "Already Exists")) {
+                               g_clear_error(&error);
+                               return BT_STATUS_SUCCESS;
+                       }
+
                        g_clear_error(&error);
                }
                return BT_STATUS_FAIL;