commit 4c7e952d48bba7876ddbc3c2aff0b2b79c12c86e
author Ajay Panicker <apanicke@google.com> Tue May 24 22:15:52 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 24 22:15:52 2016 +0000
tree 624b7cb7f9c3298a91838b62eb3432f958d35cc9
parent ae4fc8f4d4877c31d8d1925184427390d539c637
parent 1b89c8c0ddf76ce8c6ff96cc7997f87e166b7ac6

Add guest mode functionality (1/3) am: 4048610354
am: 1b89c8c0dd  -s ours

* commit '1b89c8c0ddf76ce8c6ff96cc7997f87e166b7ac6':
  Add guest mode functionality (1/3)

Change-Id: I69d69431c767ecd615839f97cef1faaa912f2f50

include/hardware/bluetooth.h

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

include/hardware/power.h

diff --git a/include/hardware/power.h b/include/hardware/power.h
index 10612f3..2625482 100644
--- a/include/hardware/power.h
+++ b/include/hardware/power.h
@@ -46,7 +46,8 @@
      */
     POWER_HINT_VIDEO_ENCODE = 0x00000003,
     POWER_HINT_VIDEO_DECODE = 0x00000004,
-    POWER_HINT_LOW_POWER = 0x00000005
+    POWER_HINT_LOW_POWER = 0x00000005,
+    POWER_HINT_FOREGROUND_LOAD = 0x00000006
 } power_hint_t;
 
 typedef enum {

modules/sensors/multihal.cpp

diff --git a/modules/sensors/multihal.cpp b/modules/sensors/multihal.cpp
index cd67f6d..d1536f4 100644
--- a/modules/sensors/multihal.cpp
+++ b/modules/sensors/multihal.cpp
@@ -34,6 +34,8 @@
 #include <dlfcn.h>
 #include <SensorEventQueue.h>
 
+#include <limits.h>
+#include <stdlib.h>
 
 static const char* CONFIG_FILENAME = "/system/etc/sensors/hals.conf";
 static const char* LEGAL_SUBHAL_PATH_PREFIX = "/system/lib/hw/";
@@ -127,7 +129,7 @@
     return global_handle;
 }
 
-static const int SENSOR_EVENT_QUEUE_CAPACITY = 20;
+static const int SENSOR_EVENT_QUEUE_CAPACITY = 36;
 
 struct TaskContext {
   sensors_poll_device_t* device;