commit 9fe1a712fbc0dc52e101105d5014b147fe1125d3
author Jakub Pawlowski <jpawlowski@google.com> Fri Nov 11 23:33:14 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 11 23:33:15 2016 +0000
tree 27ca0f3809e026efff97134035d8d0c3181547b2
parent 99adae1cf64b2fbdae035f1b591e6519a300a1b7
parent 555b8aeef9cb861b9954587fbca1bf2cada21be0

Merge "Unify advertising API (2/3)"

include/hardware/bluetooth.h

diff --git a/include/hardware/bluetooth.h b/include/hardware/bluetooth.h
index 1fe2596..125a95b 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 */

include/hardware/hw_auth_token.h

diff --git a/include/hardware/hw_auth_token.h b/include/hardware/hw_auth_token.h
index f471d1a..d84ea48 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;
+static const uint8_t HW_AUTH_TOKEN_VERSION = 0;
 
 typedef enum {
     HW_AUTH_NONE = 0,