Merge tag 'android-6.0.1_r30' into HEAD

Android 6.0.1 release 30
RM-234

Change-Id: Ib49a88726f2df18ca5ecf04fae4e2d2d31ef9a82

1 files changed, 13 insertions, 1 deletions

diff --git a/device/include/interop.h b/device/include/interop.h
index 48aaf9066..bc7a94324 100644
--- a/device/include/interop.h
+++ b/device/include/interop.h
@@ -22,11 +22,13 @@
 
 #include "btcore/include/bdaddr.h"
 
+static const char INTEROP_MODULE[] = "interop_module";
+
 typedef enum {
   // Disable secure connections
   // This is for pre BT 4.1/2 devices that do not handle secure mode
   // very well.
-  INTEROP_DISABLE_LE_SECURE_CONNECTIONS,
+  INTEROP_DISABLE_LE_SECURE_CONNECTIONS = 0,
 
   // Some devices have proven problematic during the pairing process, often
   // requiring multiple retries to complete pairing. To avoid degrading the user
@@ -80,3 +82,13 @@ bool interop_name_match(const interop_feature_t feature, const char *addr);
 // where more information is not available.
 bool interop_manufacturer_match(const interop_feature_t feature, uint16_t manufacturer);
 
+// are performed on |addr|.
+bool interop_match(const interop_feature_t feature, const bt_bdaddr_t *addr);
+
+// Add a dynamic interop database entry for a device matching the first |length| bytes
+// of |addr|, implementing the workaround identified by |feature|. |addr| may not be
+// null and |length| must be greater than 0 and less than sizeof(bt_bdaddr_t).
+void interop_database_add(const interop_feature_t feature, const bt_bdaddr_t *addr, size_t length);
+
+// Clear the dynamic portion of the interoperability workaround database.
+void interop_database_clear(void);