Merge "Merge tag 'android-6.0.0_r26' into HEAD"
diff --git a/include/hardware/hwcomposer_defs.h b/include/hardware/hwcomposer_defs.h
index 0131bc5..9c7d790 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() */
diff --git a/include/hardware/power.h b/include/hardware/power.h
index 084cba8..8825325 100644
--- a/include/hardware/power.h
+++ b/include/hardware/power.h
@@ -117,7 +117,8 @@
* User is interacting with the device, for example, touchscreen
* events are incoming. CPU and GPU load may be expected soon,
* and it may be appropriate to raise speeds of CPU, memory bus,
- * etc. The data parameter is unused.
+ * etc. The data parameter is the estimated length of the interaction
+ * in milliseconds, or 0 if unknown.
*
* POWER_HINT_LOW_POWER
*