Merge "Remove flight mode implementation from core and add it to bt-service" into...

diff --combined bt-oal/bluez_hal/src/bt-hal-event-receiver.c
index 9321872,bf962ff..ab4be63
--- 1/bt-oal/bluez_hal/src/bt-hal-event-receiver.c
--- 2/bt-oal/bluez_hal/src/bt-hal-event-receiver.c
+++ b/bt-oal/bluez_hal/src/bt-hal-event-receiver.c
@@@ -505,42 -505,6 +505,6 @@@ static void __bt_hal_adapter_property_c
        }
  }
  
- static void __bt_hal_flight_ps_mode_cb(keynode_t *node, void *data)
- {
-       gboolean flight_mode = FALSE;
-       int type;
-       DBG_SECURE("HAL callback hit");
-       DBG_SECURE("key=%s", vconf_keynode_get_name(node));
-       type = vconf_keynode_get_type(node);
-       if (type == VCONF_TYPE_BOOL) {
-               flight_mode = vconf_keynode_get_bool(node);
-               if (flight_mode != TRUE) {
-                       ERR("Ignore the event");
-                       return;
-               } else {
-                       ERR("Flight Mode == TRUE");
-               }
-       } else {
-               ERR("Invaild vconf key type : %d", type);
-               return;
-       }
-       DBG("Enabling core now");
-       _bt_hal_enable_core();
- }
- 
- static void _bt_hal_register_vconf_handler(void)
- {
-       DBG("+");
- 
-       if (vconf_notify_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE,
-               (vconf_callback_fn)__bt_hal_flight_ps_mode_cb, NULL) < 0)
-                       ERR("Unable to register key handler");
-       DBG("Telephony is disabled");
-       if (vconf_notify_key_changed(VCONFKEY_SETAPPL_PSMODE,
-               (vconf_callback_fn)__bt_hal_flight_ps_mode_cb, NULL) < 0)
-                       ERR("Unable to register key handler");
- }
- 
  void _bt_hal_handle_adapter_event(GVariant *msg, const char *member)
  {
        if (member == NULL)
@@@ -1571,9 -1535,6 +1535,6 @@@ int _bt_hal_initialize_event_receiver(h
  
        /*TODO: Initialize Obexd Event receiver */
  
-       /* Initialize event receiver for flight mode  */
-       _bt_hal_register_vconf_handler();
- 
        event_cb = cb;
  
        return BT_HAL_ERROR_NONE;
@@@ -1595,12 -1556,13 +1556,12 @@@ static void __bt_hal_device_property_ch
                        DBG("Device property changed : RSSI");
                        __bt_hal_dbus_device_found_properties(path);
                } else if (!g_strcmp0(key, "GattConnected")) {
 -                      DBG("Device property changed : GattConnected");
                        gboolean gatt_connected = FALSE;
                        g_variant_get(value, "b", &gatt_connected);
 +                      INFO("Device property changed : GattConnected [%d]", gatt_connected);
 +
                        char *address = g_malloc0(BT_HAL_ADDRESS_STRING_SIZE);
                        _bt_hal_convert_device_path_to_address(path, address);
 -                      DBG("@@gatt_connected: %d", gatt_connected);
 -                      DBG("@@address: %s", address);
                        _bt_hal_gatt_connected_state_event(gatt_connected, address);
                        _bt_hal_handle_gattc_connected_event(address, gatt_connected);
                        g_free(address);
@@@ -1622,8 -1584,10 +1583,8 @@@
  
                        if (!event_cb) {
                                ERR("Bluetooth HAL event handler not registered");
 -                      } else {
 -                              DBG("Sending HAL_EV_BOND_STATE_CHANGED event");
 +                      } else
                                event_cb(HAL_EV_BOND_STATE_CHANGED, (void*)&ev, sizeof(ev));
 -                      }
                } else if (!g_strcmp0(key, "LegacyPaired")) {
                        DBG("Device property changed : LegacyPaired");
                } else if (!g_strcmp0(key, "Trusted")) {
@@@ -1935,6 -1899,7 +1896,6 @@@ static void __bt_hal_send_device_acl_co
  
  static void __bt_hal_send_device_le_connection_state_event(int status, gboolean connected, const char *address)
  {
 -      DBG("+");
        struct hal_ev_le_conn_state_changed ev;
  
        ev.status = status;
@@@ -1954,6 -1919,7 +1915,6 @@@ static void __bt_hal_send_device_trust_
                                const char *address)
  {
        struct hal_ev_device_trust_state_changed ev;
 -      DBG("+");
  
        ev.trust = (is_trusted == TRUE) ?
                HAL_DEVICE_TRUSTED :
@@@ -1971,6 -1937,7 +1932,6 @@@ static void __bt_hal_send_device_truste
                uint32_t trust_val, const char *address)
  {
        struct hal_ev_device_trusted_profiles_changed ev;
 -      DBG("+");
  
        _bt_hal_convert_addr_string_to_type(ev.bdaddr, address);
        ev.trust_val = trust_val;
@@@ -2070,6 -2037,7 +2031,6 @@@ static void __bt_hal_handle_device_spec
                address = g_malloc0(BT_HAL_ADDRESS_STRING_SIZE);
                _bt_hal_convert_device_path_to_address(path, address);
  
 -              DBG("[%s] %s, state %d", address, profile_uuid, state);
                if (strncmp(profile_uuid, HID_UUID, strlen(HID_UUID)) == 0) {
                        DBG("HID Host Profile state: %d", state);
                        if (state == BT_HAL_PROFILE_STATE_CONNECTED)
@@@ -2153,7 -2121,7 +2114,7 @@@
                                DBG("AVRCP Controller Profile state changed: BT_HAL_PROFILE_STATE_CONNECTING");
                        }
                } else {
 -                      DBG("Profile[%s] State changed status [%d] ", profile_uuid, state);
 +                      DBG("Profile [%s] State changed [%d] [%s] ", profile_uuid, state, address);
                }
                g_free(address);
                g_free(profile_uuid);
@@@ -2163,6 -2131,8 +2124,6 @@@
  
                address = g_malloc0(BT_HAL_ADDRESS_STRING_SIZE);
  
 -              DBG("Member: [%s]", member);
 -
                _bt_hal_convert_device_path_to_address(path, address);
                g_variant_get(msg, "(q)", &mtu);
  
@@@ -2234,9 -2204,12 +2195,9 @@@ static void __bt_hal_handle_gatts_mtu_c
        memset(buf, 0, sizeof(buf));
        size = sizeof(*ev);
  
 -      DBG("Address: %s, mtu: %d", address, mtu);
 -
        ev->conn_id = _bt_get_remote_gatt_client_conn_id(address);
        ev->mtu = mtu;
  
 -      DBG("Send GATT server mtu changed event to HAL, size: [%zd]", size);
        gatt_event_cb(HAL_EV_GATT_SERVER_MTU_CHANGED, buf, size);
  }