diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 00:45:19 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 00:45:19 +0000 |
| commit | f4a9c13a6d7ef732afc0888b63149ddf601b33b0 (patch) | |
| tree | eace2b8c230cbd71633104938b5ee6416836927d | |
| parent | a14736f5986bd39fe919bc70e6330eb1fe4e6df9 (diff) | |
| parent | 8a84c19a41ea34e0bd1f098cad755e71edd97c61 (diff) | |
| download | hardware_libhardware-f4a9c13a6d7ef732afc0888b63149ddf601b33b0.zip hardware_libhardware-f4a9c13a6d7ef732afc0888b63149ddf601b33b0.tar.gz hardware_libhardware-f4a9c13a6d7ef732afc0888b63149ddf601b33b0.tar.bz2 | |
Merge tag 'android-6.0.0_r26' into cm-13.0
Android 6.0.0 release 26
| -rw-r--r-- | include/hardware/hwcomposer_defs.h | 4 | ||||
| -rw-r--r-- | include/hardware/power.h | 3 |
2 files changed, 6 insertions, 1 deletions
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 @@ enum { */ 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 11ec3b8..94e472c 100644 --- a/include/hardware/power.h +++ b/include/hardware/power.h @@ -123,7 +123,8 @@ typedef struct power_module { * 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 * |