Enable the flight mode handling logic for wearable target 56/73956/1 accepted/tizen/common/20160610.182608 accepted/tizen/ivi/20160613.022032 accepted/tizen/mobile/20160613.022102 accepted/tizen/tv/20160613.021955 accepted/tizen/wearable/20160613.022009 submit/tizen/20160610.075956
authorDoHyun Pyun <dh79.pyun@samsung.com>
Fri, 10 Jun 2016 07:34:47 +0000 (16:34 +0900)
committerDoHyun Pyun <dh79.pyun@samsung.com>
Fri, 10 Jun 2016 07:34:47 +0000 (16:34 +0900)
Change-Id: Iaba1b81bc8baf8e05cb8cf743e0b734496ac4233
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
bt-service/bt-service-adapter.c
packaging/bluetooth-frwk.spec

index 5ea51cb..834ebcf 100644 (file)
@@ -719,7 +719,7 @@ int _bt_enable_core(void)
        return BLUETOOTH_ERROR_NONE;
 }
 
-#if defined(TIZEN_TELEPHONY_ENABLED) || (!defined(TIZEN_WEARABLE) && defined(ENABLE_TIZEN_2_4))
+#if defined(TIZEN_BT_FLIGHTMODE_ENABLED) || (!defined(TIZEN_WEARABLE) && defined(ENABLE_TIZEN_2_4))
 static void __bt_service_flight_ps_mode_cb(keynode_t *node, void *data)
 {
        gboolean flight_mode = FALSE;
@@ -753,7 +753,7 @@ void _bt_service_register_vconf_handler(void)
 {
        BT_DBG("+");
 
-#ifdef TIZEN_TELEPHONY_ENABLED
+#ifdef TIZEN_BT_FLIGHTMODE_ENABLED
        if (vconf_notify_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE,
                        (vconf_callback_fn)__bt_service_flight_ps_mode_cb, NULL) < 0)
                BT_ERR("Unable to register key handler");
@@ -774,7 +774,7 @@ void _bt_service_unregister_vconf_handler(void)
 {
        BT_DBG("+");
 
-#ifdef TIZEN_TELEPHONY_ENABLED
+#ifdef TIZEN_BT_FLIGHTMODE_ENABLED
        vconf_ignore_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE,
                        (vconf_callback_fn)__bt_service_flight_ps_mode_cb);
 #endif
index 58b770b..3e64775 100644 (file)
@@ -133,7 +133,7 @@ export CFLAGS="$CFLAGS -DTIZEN_NETWORK_TETHERING_ENABLE -DTIZEN_BT_FLIGHTMODE_EN
 %endif
 
 %if "%{?profile}" == "wearable"
-export CFLAGS="$CFLAGS -DTIZEN_WEARABLE"
+export CFLAGS="$CFLAGS -DTIZEN_WEARABLE -DTIZEN_BT_FLIGHTMODE_ENABLED"
 %define _servicefile packaging/bluetooth-frwk-wearable.service
 %define _servicedir multi-user.target.wants
 %endif