commit cd2fff40a9069dfcc49c7e70a994b513c16f32f2
author Shawn Willden <swillden@google.com> Thu Sep 17 00:50:55 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 17 00:50:55 2015 +0000
tree 8dd8ee8a174d5c341f17a341a39ddd457ffb917b
parent 06926a5777f7948d094d9b96a306b28f3e570001
parent 94e514eb78714edd9267822a00b688b52ceeceeb

am 94e514eb: am e5a69c0d: Merge "Correct keymaster1 documentation."

* commit '94e514eb78714edd9267822a00b688b52ceeceeb':
  Correct keymaster1 documentation.

include/hardware/hwcomposer_defs.h

diff --git a/include/hardware/hwcomposer_defs.h b/include/hardware/hwcomposer_defs.h
index e650bd2..a19a26c 100644
--- a/include/hardware/hwcomposer_defs.h
+++ b/include/hardware/hwcomposer_defs.h
@@ -192,6 +192,10 @@
      */
     HWC_DISPLAY_DPI_X                       = 4,
     HWC_DISPLAY_DPI_Y                       = 5,
+
+    /* Indicates which of the vendor-defined color transforms is provided by
+     * this configuration. */
+    HWC_DISPLAY_COLOR_TRANSFORM             = 6,
 };
 
 /* Allowed events for hwc_methods::eventControl() */

modules/sensors/multihal.cpp

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;