summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2016-03-10 18:20:30 -0800
committerSteve Kondik <steve@cyngn.com>2016-03-10 18:20:30 -0800
commit10cb2cca93c16849809cd594abdf8015f18a852b (patch)
treee257fa86b14409b7a4a84d00867f851ad89d6076
parentdcc6b5fd693b129492a45ec75038ca582689bd5d (diff)
parent29b0311870b151fb93420ac0844b87855346a807 (diff)
downloadhardware_libhardware-10cb2cca93c16849809cd594abdf8015f18a852b.zip
hardware_libhardware-10cb2cca93c16849809cd594abdf8015f18a852b.tar.gz
hardware_libhardware-10cb2cca93c16849809cd594abdf8015f18a852b.tar.bz2
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/hardware/libhardware into cm-13.0
Android 6.0.1 release 22
-rw-r--r--modules/sensors/multihal.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/sensors/multihal.cpp b/modules/sensors/multihal.cpp
index 5fedd4d..8330ff3 100644
--- a/modules/sensors/multihal.cpp
+++ b/modules/sensors/multihal.cpp
@@ -36,6 +36,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 int MAX_CONF_LINE_LENGTH = 1024;