Remove mobile profile specific logic

Change-Id: I3d6cdfa86cca2582dd8de3532f33bbaf467201b7

diff --git a/bt-core/bt-core-adapter.c b/bt-core/bt-core-adapter.c
index 8855ea6..3b5cb24 100644 (file)
--- a/bt-core/bt-core-adapter.c
+++ b/bt-core/bt-core-adapter.c
@@ -112,18 +112,14 @@ static gboolean __bt_core_idle_terminate(gpointer data)
 
 gboolean _bt_core_is_flight_mode_enabled(void)
 {
-       int isFlightMode = 0;
+       int is_flight_mode = 0;
        int ret = -1;
 
-       if (TIZEN_FEATURE_FLIGHTMODE_ENABLED) {
-               ret = vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &isFlightMode);
-               if (ret != 0)
-                       BT_ERR("vconf_get_bool failed");
+       ret = vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &is_flight_mode);
+       if (ret != 0)
+               BT_ERR("vconf_get_bool failed");
 
-               return isFlightMode;
-       } else {
-               return FALSE;
-       }
+       return is_flight_mode;
 }
 
 static int __bt_call_systemact_service(const char *service_name)

diff --git a/bt-service/services/obex/bt-service-obex-event-receiver.c b/bt-service/services/obex/bt-service-obex-event-receiver.c
index b41fe31..5d22d11 100644 (file)
--- a/bt-service/services/obex/bt-service-obex-event-receiver.c
+++ b/bt-service/services/obex/bt-service-obex-event-receiver.c
@@ -130,17 +130,14 @@ static int __bt_get_agent_signal_info(GVariant *msg, char **address,
 
 gboolean __bt_handle_is_flight_mode_enabled(void)
 {
-       if (TIZEN_FEATURE_FLIGHTMODE_ENABLED) {
-               int is_flight_mode = 0;
-               int ret = -1;
-               ret = vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &is_flight_mode);
-               if (ret != 0)
-                       BT_ERR("vconf_get_bool failed");
-
-               return (is_flight_mode == 0) ? FALSE : TRUE;
-       } else {
-               return FALSE;
-       }
+       int is_flight_mode = 0;
+       int ret = -1;
+
+       ret = vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &is_flight_mode);
+       if (ret != 0)
+               BT_ERR("vconf_get_bool failed");
+
+       return is_flight_mode;
 }
 
 void _bt_handle_adapter_event(GVariant *msg, const char *member)

diff --git a/packaging/bluetooth-frwk-common.service b/packaging/bluetooth-frwk-common.service
index 9d15b36..bf48b13 100644 (file)
--- a/packaging/bluetooth-frwk-common.service
+++ b/packaging/bluetooth-frwk-common.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=Bluetooth framework
+After=dbus.service
 
 [Service]
 User=network_fw