fhub: apply DA feature (default a2dp mode, adv data flag)

Change-Id: I9251ad5ddac62efeb6c743ed086c13f526594c21
Signed-off-by: Ayush Garg <ayush.garg@samsung.com>

diff --git a/profiles/audio/media.c b/profiles/audio/media.c
index 103dda8db6027d1b7fe19dd95d6ef67c426f0e62..91d73a0b9ec55ba4855a63a665064e69ec58b205 100644 (file)
--- a/profiles/audio/media.c
+++ b/profiles/audio/media.c
@@ -1171,7 +1171,7 @@ static DBusMessage *a2dp_select_role(DBusConnection *conn, DBusMessage *msg,
                source_endpoint->sep = NULL;
        } else if (!g_strcmp0(a2dp_role, A2DP_SOURCE_ROLE)) {
                if (btd_adapter_get_a2dp_role(adapter->btd_adapter) == BLUETOOTH_A2DP_SOURCE_ROLE) {
-                       DBG("Already selected A2DP sink role");
+                       DBG("Already selected A2DP source role");
                        return btd_error_already_exists(msg);
                }
 

diff --git a/src/adapter.c b/src/adapter.c
index 6d5cc2303140737702b116bab2de347ce22c2fba..d1f775186158cbe5847e7ab979ba7bf44f26a4a1 100644 (file)
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -1139,7 +1139,11 @@ static bool set_mode(struct btd_adapter *adapter, uint16_t opcode,
 
        adapter->pending_settings |= setting;
 
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+       DBG("sending 0x%4.4x set mode %d command for index %u", opcode, mode, adapter->dev_id);
+#else
        DBG("sending set mode command for index %u", adapter->dev_id);
+#endif
 
        if (mgmt_send(adapter->mgmt, opcode,
                                adapter->dev_id, sizeof(cp), &cp,
@@ -4291,8 +4295,15 @@ static int set_adv_data_flag(uint8_t *adv_data, uint8_t *data, int data_len, voi
        if (adapter->le_static_addr.b[5] != 0)
                adv_data[2] = EIR_GEN_DISC | EIR_CONTROLLER |
                                EIR_SIM_HOST | EIR_BREDR_UNSUP;
-       else
-               adv_data[2] = EIR_GEN_DISC | EIR_CONTROLLER | EIR_SIM_HOST;
+       else {
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+               if (TIZEN_FEATURE_BLUEZ_FHUB) {
+                       DBG("Disable LE General Discoverable Mode");
+                       adv_data[2] = EIR_CONTROLLER | EIR_SIM_HOST;
+               } else
+#endif
+                       adv_data[2] = EIR_GEN_DISC | EIR_CONTROLLER | EIR_SIM_HOST;
+       }
 
        memcpy(adv_data + 3, data, data_len);
        return data_len + 3;
@@ -11631,7 +11642,13 @@ static void load_config(struct btd_adapter *adapter)
        adapter->stored_discoverable = g_key_file_get_boolean(key_file,
                                        "General", "Discoverable", &gerr);
        if (gerr) {
-               adapter->stored_discoverable = false;
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+               if (TIZEN_FEATURE_BLUEZ_FHUB) {
+                       DBG("Default Discoverable mode is TRUE");
+                       adapter->stored_discoverable = true;
+               } else
+#endif
+                       adapter->stored_discoverable = false;
                g_error_free(gerr);
                gerr = NULL;
        }