Remove the redundency to make profile rpms

[platform/core/connectivity/bluetooth-agent.git] / ag-agent / bluetooth-ag-agent.c

diff --git a/ag-agent/bluetooth-ag-agent.c b/ag-agent/bluetooth-ag-agent.c
index 9555899..d6f9bbb 100755 (executable)
--- a/ag-agent/bluetooth-ag-agent.c
+++ b/ag-agent/bluetooth-ag-agent.c
@@ -29,6 +29,7 @@
 #include <bundle_internal.h>
 #include "bluetooth-ag-agent.h"
 #include "bluetooth-ag-handler.h"
+#include "bluetooth-agent-profile.h"
 
 #include <TapiUtility.h>
 #include <ITapiSim.h>
@@ -74,10 +75,7 @@ static bt_ag_media_transport_state_t transport_state;
 #define A2DP_SINK_UUID "0000110b-0000-1000-8000-00805f9b34fb"
 #endif
 #define DEFAULT_ADAPTER_OBJECT_PATH "/org/bluez/hci0"
-
-#ifdef TIZEN_FEATURE_BT_LUNAR_DEVICE
 #define VCONF_KEY_BT_LUNAR_ENABLED "db/wms/bt_loop_device_hfp_connected"
-#endif
 
 #if defined(TIZEN_PROFILE_WEARABLE) && defined(TIZEN_FEATURE_BT_HFP_AG)
 #define CALL_APP_ID "org.tizen.call-ui"
@@ -555,7 +553,6 @@ static gboolean __bt_get_outgoing_call_condition(int *condition)
 #endif
 }
 
-#if defined(TIZEN_PROFILE_WEARABLE) && defined(TIZEN_TELEPHONY_ENABLED)
 static gboolean  __bt_ag_agent_launch_call_app(const char *number)
 {
        FN_START;
@@ -581,7 +578,6 @@ static gboolean  __bt_ag_agent_launch_call_app(const char *number)
        FN_END;
        return TRUE;
 }
-#endif
 
 static void *__bt_ag_agent_launch_call_req(void *arg)
 {
@@ -599,14 +595,13 @@ static gboolean __bt_ag_agent_make_call(const char *number)
 {
        FN_START;
 
-#if defined(TIZEN_PROFILE_WEARABLE) && defined(TIZEN_FEATURE_BT_HFP_AG)
-       FN_END;
-       return __bt_ag_agent_launch_call_app(number);
-#else
        char telnum[BT_MAX_TEL_NUM_STRING];
        bundle *b;
        pthread_t thread_id;
 
+       if (TIZEN_PROFILE_WEARABLE)
+               return __bt_ag_agent_launch_call_app(number);
+
        if (call_launch_requested == TRUE) {
                DBG("Launch request is in progress");
                return TRUE;
@@ -634,7 +629,6 @@ static gboolean __bt_ag_agent_make_call(const char *number)
 
        FN_END;
        return TRUE;
-#endif
 }
 
 static gboolean __bt_ag_agent_make_video_call(const char *mo_number)
@@ -1638,14 +1632,10 @@ static bt_hfp_agent_error_t __bt_hfp_send_bcs_command(bt_ag_info_t *hs,
        uint32_t codec;
        struct ag_codec *data = NULL;;
 
-#ifdef TIZEN_FEATURE_BT_KIRAN_DEVICE
-       codec = BT_CVSD_CODEC_ID;
-#else
        if (hs->codec_info.remote_codecs & BT_MSBC_CODEC_MASK)
                codec = BT_MSBC_CODEC_ID;
        else
                codec = BT_CVSD_CODEC_ID;
-#endif
 
        if (wbs_opts.wbs_enable == FALSE)
                codec = BT_CVSD_CODEC_ID;
@@ -3754,7 +3744,6 @@ static void __bt_ag_agent_network_signal_status_cb(keynode_t *node)
        _bt_hfp_set_property_value("SignalBarsChanged", signal_bar);
 }
 
-#ifdef TIZEN_FEATURE_BT_LUNAR_DEVICE
 static void __bt_ag_agent_lunar_connection_status_cb(keynode_t *node)
 {
        gboolean status = vconf_keynode_get_bool(node);
@@ -3768,7 +3757,6 @@ static void __bt_ag_agent_lunar_connection_status_cb(keynode_t *node)
                }
        }
 }
-#endif
 
 static void __bt_ag_agent_network_register_status_cb(keynode_t *node)
 {
@@ -3827,13 +3815,12 @@ static void __bt_ag_agent_subscribe_vconf_updates(void)
        if (0 != ret)
                ERR("Subsrciption to network failed err =  [%d]\n", ret);
 
-#ifdef TIZEN_FEATURE_BT_LUNAR_DEVICE
-       ret = vconf_notify_key_changed(VCONF_KEY_BT_LUNAR_ENABLED,
-                       (void *)__bt_ag_agent_lunar_connection_status_cb, NULL);
-       if (0 != ret)
-               ERR("Subsrciption to lunar connection failed err =  [%d]\n", ret);
-
-#endif
+       if (TIZEN_PROFILE_WEARABLE) {
+               ret = vconf_notify_key_changed(VCONF_KEY_BT_LUNAR_ENABLED,
+                               (void *)__bt_ag_agent_lunar_connection_status_cb, NULL);
+               if (0 != ret)
+                       ERR("Subsrciption to lunar connection failed err =  [%d]\n", ret);
+       }
 }
 
 static void __bt_ag_agent_release_vconf_updates(void)
@@ -4345,9 +4332,7 @@ static uint32_t __bt_ag_agent_get_ag_features(void)
                                BT_AG_FEATURE_REJECT_CALL |
                                BT_AG_FEATURE_ENHANCED_CALL_STATUS |
                                BT_AG_FEATURE_THREE_WAY_CALL |
-#ifndef TIZEN_FEATURE_BT_KIRAN_DEVICE
                                BT_AG_FEATURE_VOICE_RECOGNITION |
-#endif
                                BT_AG_FEATURE_EXTENDED_ERROR_RESULT_CODES;
 
        wbs_en = TRUE;