Merge tag 'android-6.0.1_r52' into marshmallow-x86

Android 6.0.1 Release 52 (MOB30R)

diff --git a/include/hardware/bluetooth.h b/include/hardware/bluetooth.h
index 0f1a35b..68cbd1e 100644 (file)
--- a/include/hardware/bluetooth.h
+++ b/include/hardware/bluetooth.h
@@ -438,7 +438,7 @@ typedef struct {
     int (*init)(bt_callbacks_t* callbacks );
 
     /** Enable Bluetooth. */
-    int (*enable)(void);
+    int (*enable)(bool guest_mode);
 
     /** Disable Bluetooth. */
     int (*disable)(void);