Revert "Move passkey reply APIs to internal header"

This reverts commit 06ca04d3b5827d12adc8fd89d9573175cfca7af2.

Change-Id: If4563eb7ccbaf5461a63596a23e1a0a9acda7737

diff --git a/include/bluetooth_private.h b/include/bluetooth_private.h
index f0acbdf..1407f6c 100644 (file)
--- a/include/bluetooth_private.h
+++ b/include/bluetooth_private.h
@@ -674,6 +674,33 @@ int bt_adapter_set_authentication_req_cb(bt_adapter_authentication_req_cb callba
  */
 int bt_adapter_unset_authentication_req_cb(void);
 
+/**
+ * @ingroup  CAPI_NETWORK_BLUETOOTH_DEVICE_MODULE
+ * @brief  API to reply with PIN or PASSKEY with authentication type - TRUE or FALSE.
+ * @remarks  This function can be called by application when remote device requests PIN or PASSKEY from
+ *           local adapter.
+ * @param[in]  passkey  The passkey to be provided by application when remote devices requests for it.
+ * @param[in]  authentication_reply This indicates whether application wants to accept or cancel the on-going pairing
+ * @pre  This function can only be called when application receieves authentication event (BT_AUTH_PIN_REQUEST)
+ *       from remote device.
+ * @see  bt_adapter_set_authentication_req_cb()
+ */
+int bt_passkey_reply(char *passkey, bool authentication_reply);
+
+/**
+ * @ingroup  CAPI_NETWORK_BLUETOOTH_DEVICE_MODULE
+ * @brief  API to reply to the PASSKEY confirmation for on-going pairing with remote device.
+ * @remarks  This function can be called by application, when local adapter wants PASSKEY confirmation from user.
+ * @param[in]  confirmation_reply This indicates whether application wants to accepts or cancels the on-going pairing
+ *             confirmation_reply : TRUE will indicate that Application has confirmed the PASSKEY
+ *             confirmation_reply : FALSE will indicate that Application has failed to confirm the PASSKEY. In this situation
+ *             the pairing will be failed.
+ * @pre  This function can only be called when application receives authentication event (BT_AUTH_PASSKEY_CONFIRM_REQUEST)
+ *       from remote device.
+ * @see  bt_adapter_set_authentication_req_cb()
+ */
+int bt_passkey_confirmation_reply(bool confirmation_reply);
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/include/mobile/bluetooth_internal.h b/include/mobile/bluetooth_internal.h
index f2311f4..2fd346b 100644 (file)
--- a/include/mobile/bluetooth_internal.h
+++ b/include/mobile/bluetooth_internal.h
@@ -3018,33 +3018,6 @@ int bt_dpm_set_data_transfer_state(bt_dpm_status_e value);
 int bt_dpm_get_data_transfer_state(bt_dpm_status_e *value);
 
 /**
- * @ingroup  CAPI_NETWORK_BLUETOOTH_DEVICE_MODULE
- * @brief  API to reply with PIN or PASSKEY with authentication type - TRUE or FALSE.
- * @remarks  This function can be called by application when remote device requests PIN or PASSKEY from
- *           local adapter.
- * @param[in]  passkey  The passkey to be provided by application when remote devices requests for it.
- * @param[in]  authentication_reply This indicates whether application wants to accept or cancel the on-going pairing
- * @pre  This function can only be called when application receieves authentication event (BT_AUTH_PIN_REQUEST)
- *       from remote device.
- * @see  bt_adapter_set_authentication_req_cb()
- */
-int bt_passkey_reply(char *passkey, bool authentication_reply);
-
-/**
- * @ingroup  CAPI_NETWORK_BLUETOOTH_DEVICE_MODULE
- * @brief  API to reply to the PASSKEY confirmation for on-going pairing with remote device.
- * @remarks  This function can be called by application, when local adapter wants PASSKEY confirmation from user.
- * @param[in]  confirmation_reply This indicates whether application wants to accepts or cancels the on-going pairing
- *             confirmation_reply : TRUE will indicate that Application has confirmed the PASSKEY
- *             confirmation_reply : FALSE will indicate that Application has failed to confirm the PASSKEY. In this situation
- *             the pairing will be failed.
- * @pre  This function can only be called when application receives authentication event (BT_AUTH_PASSKEY_CONFIRM_REQUEST)
- *       from remote device.
- * @see  bt_adapter_set_authentication_req_cb()
- */
-int bt_passkey_confirmation_reply(bool confirmation_reply);
-
-/**
  * @}
  */
 

diff --git a/include/tv/bluetooth_internal.h b/include/tv/bluetooth_internal.h
index 283ebb7..ce3ba68 100644 (file)
--- a/include/tv/bluetooth_internal.h
+++ b/include/tv/bluetooth_internal.h
@@ -3019,33 +3019,6 @@ int bt_dpm_set_data_transfer_state(bt_dpm_status_e value);
 int bt_dpm_get_data_transfer_state(bt_dpm_status_e *value);
 
 /**
- * @ingroup  CAPI_NETWORK_BLUETOOTH_DEVICE_MODULE
- * @brief  API to reply with PIN or PASSKEY with authentication type - TRUE or FALSE.
- * @remarks  This function can be called by application when remote device requests PIN or PASSKEY from
- *           local adapter.
- * @param[in]  passkey  The passkey to be provided by application when remote devices requests for it.
- * @param[in]  authentication_reply This indicates whether application wants to accept or cancel the on-going pairing
- * @pre  This function can only be called when application receieves authentication event (BT_AUTH_PIN_REQUEST)
- *       from remote device.
- * @see  bt_adapter_set_authentication_req_cb()
- */
-int bt_passkey_reply(char *passkey, bool authentication_reply);
-
-/**
- * @ingroup  CAPI_NETWORK_BLUETOOTH_DEVICE_MODULE
- * @brief  API to reply to the PASSKEY confirmation for on-going pairing with remote device.
- * @remarks  This function can be called by application, when local adapter wants PASSKEY confirmation from user.
- * @param[in]  confirmation_reply This indicates whether application wants to accepts or cancels the on-going pairing
- *             confirmation_reply : TRUE will indicate that Application has confirmed the PASSKEY
- *             confirmation_reply : FALSE will indicate that Application has failed to confirm the PASSKEY. In this situation
- *             the pairing will be failed.
- * @pre  This function can only be called when application receives authentication event (BT_AUTH_PASSKEY_CONFIRM_REQUEST)
- *       from remote device.
- * @see  bt_adapter_set_authentication_req_cb()
- */
-int bt_passkey_confirmation_reply(bool confirmation_reply);
-
-/**
  * @}
  */
 

diff --git a/include/wearable/bluetooth_internal.h b/include/wearable/bluetooth_internal.h
index da17c82..72d23a3 100644 (file)
--- a/include/wearable/bluetooth_internal.h
+++ b/include/wearable/bluetooth_internal.h
@@ -3166,33 +3166,6 @@ int bt_dpm_set_data_transfer_state(bt_dpm_status_e value);
 int bt_dpm_get_data_transfer_state(bt_dpm_status_e *value);
 
 /**
- * @ingroup  CAPI_NETWORK_BLUETOOTH_DEVICE_MODULE
- * @brief  API to reply with PIN or PASSKEY with authentication type - TRUE or FALSE.
- * @remarks  This function can be called by application when remote device requests PIN or PASSKEY from
- *           local adapter.
- * @param[in]  passkey  The passkey to be provided by application when remote devices requests for it.
- * @param[in]  authentication_reply This indicates whether application wants to accept or cancel the on-going pairing
- * @pre  This function can only be called when application receieves authentication event (BT_AUTH_PIN_REQUEST)
- *       from remote device.
- * @see  bt_adapter_set_authentication_req_cb()
- */
-int bt_passkey_reply(char *passkey, bool authentication_reply);
-
-/**
- * @ingroup  CAPI_NETWORK_BLUETOOTH_DEVICE_MODULE
- * @brief  API to reply to the PASSKEY confirmation for on-going pairing with remote device.
- * @remarks  This function can be called by application, when local adapter wants PASSKEY confirmation from user.
- * @param[in]  confirmation_reply This indicates whether application wants to accepts or cancels the on-going pairing
- *             confirmation_reply : TRUE will indicate that Application has confirmed the PASSKEY
- *             confirmation_reply : FALSE will indicate that Application has failed to confirm the PASSKEY. In this situation
- *             the pairing will be failed.
- * @pre  This function can only be called when application receives authentication event (BT_AUTH_PASSKEY_CONFIRM_REQUEST)
- *       from remote device.
- * @see  bt_adapter_set_authentication_req_cb()
- */
-int bt_passkey_confirmation_reply(bool confirmation_reply);
-
-/**
  * @}
  */