Tizen 2.4.0 rev3 SDK Public Releasesubmit/tizen_2.4/20160530.084702accepted/tizen/2.4/mobile/20160530.220757tizen_2.4accepted/tizen_2.4_mobile

4 files changed, 30 insertions, 35 deletions

diff --git a/include/bluetooth_private.h b/include/bluetooth_private.h
index afbef1a..df37dd8 100644..100755
--- a/include/bluetooth_private.h
+++ b/include/bluetooth_private.h
@@ -299,9 +299,6 @@ typedef struct {
 	bt_gatt_server_read_value_requested_cb read_requested_cb;
 	void *read_requested_user_data;
 
-	bt_gatt_server_notification_sent_cb indication_confirm_cb;
-	void *indication_confirm_user_data;
-
 	bt_gatt_server_notification_state_change_cb notification_changed_cb;
 	void *notification_changed_user_data;
 
diff --git a/include/mobile/bluetooth.h b/include/mobile/bluetooth.h
index 3e0b269..1c1ad99 100755
--- a/include/mobile/bluetooth.h
+++ b/include/mobile/bluetooth.h
@@ -2683,8 +2683,8 @@ int bt_avrcp_target_deinitialize(void);
  * @ingroup CAPI_NETWORK_BLUETOOTH_AVRCP_MODULE
  * @brief  Notifies the equalize state to the remote device.
  * @since_tizen 2.4
- * @privlevel public
- * @privilege %http://tizen.org/privilege/bluetooth
+ * @privlevel platform
+ * @privilege %http://tizen.org/privilege/bluetooth.admin
  * @param[in] state The state of equalizer
  * @return   0 on success, otherwise a negative error value.
  * @retval #BT_ERROR_NONE  Successful
@@ -2706,8 +2706,8 @@ int bt_avrcp_target_notify_equalizer_state(bt_avrcp_equalizer_state_e state);
  * @ingroup CAPI_NETWORK_BLUETOOTH_AVRCP_MODULE
  * @brief  Notifies the repeat mode to the remote device.
  * @since_tizen 2.4
- * @privlevel public
- * @privilege %http://tizen.org/privilege/bluetooth
+ * @privlevel platform
+ * @privilege %http://tizen.org/privilege/bluetooth.admin
  * @param[in] mode The repeat mode
  * @return   0 on success, otherwise a negative error value.
  * @retval #BT_ERROR_NONE  Successful
@@ -2729,8 +2729,8 @@ int bt_avrcp_target_notify_repeat_mode(bt_avrcp_repeat_mode_e mode);
  * @ingroup CAPI_NETWORK_BLUETOOTH_AVRCP_MODULE
  * @brief  Notifies the shuffle mode to the remote device.
  * @since_tizen 2.4
- * @privlevel public
- * @privilege %http://tizen.org/privilege/bluetooth
+ * @privlevel platform
+ * @privilege %http://tizen.org/privilege/bluetooth.admin
  * @param[in] mode The repeat mode
  * @return   0 on success, otherwise a negative error value.
  * @retval #BT_ERROR_NONE  Successful
@@ -2752,8 +2752,8 @@ int bt_avrcp_target_notify_shuffle_mode(bt_avrcp_shuffle_mode_e mode);
  * @ingroup CAPI_NETWORK_BLUETOOTH_AVRCP_MODULE
  * @brief  Notifies the scan mode to the remote device.
  * @since_tizen 2.4
- * @privlevel public
- * @privilege %http://tizen.org/privilege/bluetooth
+ * @privlevel platform
+ * @privilege %http://tizen.org/privilege/bluetooth.admin
  * @param[in] mode The scan mode
  * @return   0 on success, otherwise a negative error value.
  * @retval #BT_ERROR_NONE  Successful
@@ -2775,8 +2775,8 @@ int bt_avrcp_target_notify_scan_mode(bt_avrcp_scan_mode_e mode);
  * @ingroup CAPI_NETWORK_BLUETOOTH_AVRCP_MODULE
  * @brief  Notifies the player state to the remote device.
  * @since_tizen 2.4
- * @privlevel public
- * @privilege %http://tizen.org/privilege/bluetooth
+ * @privlevel platform
+ * @privilege %http://tizen.org/privilege/bluetooth.admin
  * @param[in] state The player state
  * @return   0 on success, otherwise a negative error value.
  * @retval #BT_ERROR_NONE  Successful
@@ -2798,8 +2798,8 @@ int bt_avrcp_target_notify_player_state(bt_avrcp_player_state_e state);
  * @ingroup CAPI_NETWORK_BLUETOOTH_AVRCP_MODULE
  * @brief  Notifies the current position of song to the remote device.
  * @since_tizen 2.4
- * @privlevel public
- * @privilege %http://tizen.org/privilege/bluetooth
+ * @privlevel platform
+ * @privilege %http://tizen.org/privilege/bluetooth.admin
  * @param[in] position The current position in milliseconds
  * @return  0 on success, otherwise a negative error value.
  * @retval #BT_ERROR_NONE  Successful
@@ -2821,8 +2821,8 @@ int bt_avrcp_target_notify_position(unsigned int position);
  * @ingroup CAPI_NETWORK_BLUETOOTH_AVRCP_MODULE
  * @brief  Notifies the track to the remote device.
  * @since_tizen 2.4
- * @privlevel public
- * @privilege %http://tizen.org/privilege/bluetooth
+ * @privlevel platform
+ * @privilege %http://tizen.org/privilege/bluetooth.admin
  * @param[in] title The title of track
  * @param[in] artist The artist of track
  * @param[in] album The album of track
diff --git a/include/mobile/bluetooth_internal.h b/include/mobile/bluetooth_internal.h
index 598bdd5..c1fc1d6 100644
--- a/include/mobile/bluetooth_internal.h
+++ b/include/mobile/bluetooth_internal.h
@@ -2157,13 +2157,12 @@ int bt_gatt_server_send_response(int request_id,
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_GATT_MODULE
- * @brief  Notifies value change of the characteristic to the remote devices which enable a Client Characteristic Configuration Descriptor
+ * @brief  Notifys a value change of the characteristic to the remote devices which enable a Client Characteristic Configuration Descriptor
  * @since_tizen 2.4
  *
  * @param[in] characteristic The characteristic which has a changed value
  * @param[in] need_confirm If it is true, an indication is sent. If it is false, a notification is sent.
  * @param[in] callback The function to be invoked on each remote device when a sending operation is done
- * @param[in] device_address Remote device address to send notify or indicate and if set to NULL then notify/indicate all is enabled.
  * @param[in] user_data The user data to be passed to @a callback function
  * @return  0 on success, otherwise a negative error value
  * @retval #BT_ERROR_NONE Successful
@@ -2173,8 +2172,7 @@ int bt_gatt_server_send_response(int request_id,
  * @see bt_gatt_server_notification_sent_cb()
  */
 int bt_gatt_server_notify(bt_gatt_h characteristic, bool need_confirm,
-				bt_gatt_server_notification_sent_cb callback,
-				const char *device_address, void *user_data);
+		bt_gatt_server_notification_sent_cb callback, void *user_data);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_GATT_MODULE
diff --git a/include/wearable/bluetooth.h b/include/wearable/bluetooth.h
index 962012b..2f7bc2f 100755
--- a/include/wearable/bluetooth.h
+++ b/include/wearable/bluetooth.h
@@ -2456,8 +2456,8 @@ int bt_avrcp_target_deinitialize(void);
  * @ingroup CAPI_NETWORK_BLUETOOTH_AVRCP_MODULE
  * @brief  Notifies the equalize state to the remote device.
  * @since_tizen 2.4
- * @privlevel public
- * @privilege %http://tizen.org/privilege/bluetooth
+ * @privlevel platform
+ * @privilege %http://tizen.org/privilege/bluetooth.admin
  * @param[in] state The state of equalizer
  * @return   0 on success, otherwise a negative error value.
  * @retval #BT_ERROR_NONE  Successful
@@ -2479,8 +2479,8 @@ int bt_avrcp_target_notify_equalizer_state(bt_avrcp_equalizer_state_e state);
  * @ingroup CAPI_NETWORK_BLUETOOTH_AVRCP_MODULE
  * @brief  Notifies the repeat mode to the remote device.
  * @since_tizen 2.4
- * @privlevel public
- * @privilege %http://tizen.org/privilege/bluetooth
+ * @privlevel platform
+ * @privilege %http://tizen.org/privilege/bluetooth.admin
  * @param[in] mode The repeat mode
  * @return   0 on success, otherwise a negative error value.
  * @retval #BT_ERROR_NONE  Successful
@@ -2502,8 +2502,8 @@ int bt_avrcp_target_notify_repeat_mode(bt_avrcp_repeat_mode_e mode);
  * @ingroup CAPI_NETWORK_BLUETOOTH_AVRCP_MODULE
  * @brief  Notifies the shuffle mode to the remote device.
  * @since_tizen 2.4
- * @privlevel public
- * @privilege %http://tizen.org/privilege/bluetooth
+ * @privlevel platform
+ * @privilege %http://tizen.org/privilege/bluetooth.admin
  * @param[in] mode The repeat mode
  * @return   0 on success, otherwise a negative error value.
  * @retval #BT_ERROR_NONE  Successful
@@ -2525,8 +2525,8 @@ int bt_avrcp_target_notify_shuffle_mode(bt_avrcp_shuffle_mode_e mode);
  * @ingroup CAPI_NETWORK_BLUETOOTH_AVRCP_MODULE
  * @brief  Notifies the scan mode to the remote device.
  * @since_tizen 2.4
- * @privlevel public
- * @privilege %http://tizen.org/privilege/bluetooth
+ * @privlevel platform
+ * @privilege %http://tizen.org/privilege/bluetooth.admin
  * @param[in] mode The scan mode
  * @return   0 on success, otherwise a negative error value.
  * @retval #BT_ERROR_NONE  Successful
@@ -2548,8 +2548,8 @@ int bt_avrcp_target_notify_scan_mode(bt_avrcp_scan_mode_e mode);
  * @ingroup CAPI_NETWORK_BLUETOOTH_AVRCP_MODULE
  * @brief  Notifies the player state to the remote device.
  * @since_tizen 2.4
- * @privlevel public
- * @privilege %http://tizen.org/privilege/bluetooth
+ * @privlevel platform
+ * @privilege %http://tizen.org/privilege/bluetooth.admin
  * @param[in] state The player state
  * @return   0 on success, otherwise a negative error value.
  * @retval #BT_ERROR_NONE  Successful
@@ -2571,8 +2571,8 @@ int bt_avrcp_target_notify_player_state(bt_avrcp_player_state_e state);
  * @ingroup CAPI_NETWORK_BLUETOOTH_AVRCP_MODULE
  * @brief  Notifies the current position of song to the remote device.
  * @since_tizen 2.4
- * @privlevel public
- * @privilege %http://tizen.org/privilege/bluetooth
+ * @privlevel platform
+ * @privilege %http://tizen.org/privilege/bluetooth.admin
  * @param[in] position The current position in milliseconds
  * @return  0 on success, otherwise a negative error value.
  * @retval #BT_ERROR_NONE  Successful
@@ -2594,8 +2594,8 @@ int bt_avrcp_target_notify_position(unsigned int position);
  * @ingroup CAPI_NETWORK_BLUETOOTH_AVRCP_MODULE
  * @brief  Notifies the track to the remote device.
  * @since_tizen 2.4
- * @privlevel public
- * @privilege %http://tizen.org/privilege/bluetooth
+ * @privlevel platform
+ * @privilege %http://tizen.org/privilege/bluetooth.admin
  * @param[in] title The title of track
  * @param[in] artist The artist of track
  * @param[in] album The album of track