DO NOT MERGE ANYWHERE Provide HFP API to set AG SCO policy
am: bf47a8ec52 -s ours
Change-Id: I7ad104de5138a8b18e59aa37f2659ec94eacd1f6
diff --git a/include/hardware/bluetooth.h b/include/hardware/bluetooth.h
index b9b3b12..dd5ea8a 100644
--- a/include/hardware/bluetooth.h
+++ b/include/hardware/bluetooth.h
@@ -267,6 +267,7 @@
/** Bluetooth Out Of Band data for bonding */
typedef struct
{
+ uint8_t le_bt_dev_addr[7]; /* LE Bluetooth Device Address */
uint8_t c192[16]; /* Simple Pairing Hash C-192 */
uint8_t r192[16]; /* Simple Pairing Randomizer R-192 */
uint8_t c256[16]; /* Simple Pairing Hash C-256 */
diff --git a/include/hardware/bt_hf.h b/include/hardware/bt_hf.h
index c096218..0a77675 100644
--- a/include/hardware/bt_hf.h
+++ b/include/hardware/bt_hf.h
@@ -323,9 +323,6 @@
/** Response for HF Indicator change (+BIND) */
bt_status_t (*bind_response)(bthf_hf_ind_type_t ind_id, bthf_hf_ind_status_t ind_status,
bt_bdaddr_t *bd_addr);
-
- /** Whether we will initiate SCO or not **/
- bt_status_t (*set_sco_allowed)(bool value);
} bthf_interface_t;
__END_DECLS
diff --git a/include/hardware/hw_auth_token.h b/include/hardware/hw_auth_token.h
index f471d1a..3305f2c 100644
--- a/include/hardware/hw_auth_token.h
+++ b/include/hardware/hw_auth_token.h
@@ -23,7 +23,7 @@
extern "C" {
#endif // __cplusplus
-const uint8_t HW_AUTH_TOKEN_VERSION = 0;
+#define HW_AUTH_TOKEN_VERSION 0
typedef enum {
HW_AUTH_NONE = 0,