commit 01ad343cdfa28eb3b2b47115bca4b07d366915bc
author The Android Automerger <android-build@google.com> Wed Jun 26 12:17:24 2013 -0700
committer The Android Automerger <android-build@google.com> Wed Jun 26 12:17:24 2013 -0700
tree 83142f38ac6b7c6276570b0ed344440c26ed61c5
parent 1a70c0fd39eed070c2c28fc0731fa689d15931c4
parent 2ffc283435748b134c32efb14db54b5393eb51c8

merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev

include/hardware/power.h

diff --git a/include/hardware/power.h b/include/hardware/power.h
index 6c55061..89d57ed 100644
--- a/include/hardware/power.h
+++ b/include/hardware/power.h
@@ -28,7 +28,6 @@
 #define POWER_MODULE_API_VERSION_0_1  HARDWARE_MODULE_API_VERSION(0, 1)
 #define POWER_MODULE_API_VERSION_0_2  HARDWARE_MODULE_API_VERSION(0, 2)
 
-
 /**
  * The id of this module
  */
@@ -41,6 +40,11 @@
 typedef enum {
     POWER_HINT_VSYNC = 0x00000001,
     POWER_HINT_INTERACTION = 0x00000002,
+    /* DO NOT USE POWER_HINT_VIDEO_ENCODE/_DECODE!  They will be removed in
+     * KLP.
+     */
+    POWER_HINT_VIDEO_ENCODE = 0x00000003,
+    POWER_HINT_VIDEO_DECODE = 0x00000004
 } power_hint_t;
 
 /**