summaryrefslogtreecommitdiffstats
path: root/include/surfaceflinger
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2010-10-15 08:33:43 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-15 08:33:43 -0700
commite33a35f02576b482a5ac4891a78f6e72fb4c0dea (patch)
tree7e9ccef31a0f35a75e4e7b892a1ac363140f6acc /include/surfaceflinger
parent2222fb317ada2df48e22da78f35f06a27d9255af (diff)
parentd91595b0004d24d0183fcbc594c693105b6c906b (diff)
downloadframeworks_native-e33a35f02576b482a5ac4891a78f6e72fb4c0dea.zip
frameworks_native-e33a35f02576b482a5ac4891a78f6e72fb4c0dea.tar.gz
frameworks_native-e33a35f02576b482a5ac4891a78f6e72fb4c0dea.tar.bz2
am 5bfa3a34: am 011b5bcc: Merge "implement part of [3094280] New animation for screen on and screen off add support for screen on animation" into gingerbread
Merge commit '5bfa3a34eaef759c3ec4def76f646eb1c0bf997f' * commit '5bfa3a34eaef759c3ec4def76f646eb1c0bf997f': implement part of [3094280] New animation for screen on and screen off
Diffstat (limited to 'include/surfaceflinger')
-rw-r--r--include/surfaceflinger/ISurfaceComposer.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/surfaceflinger/ISurfaceComposer.h b/include/surfaceflinger/ISurfaceComposer.h
index ac69a06..0c9a072 100644
--- a/include/surfaceflinger/ISurfaceComposer.h
+++ b/include/surfaceflinger/ISurfaceComposer.h
@@ -120,6 +120,7 @@ public:
uint32_t reqWidth, uint32_t reqHeight) = 0;
virtual status_t turnElectronBeamOff(int32_t mode) = 0;
+ virtual status_t turnElectronBeamOn(int32_t mode) = 0;
/* Signal surfaceflinger that there might be some work to do
* This is an ASYNCHRONOUS call.
@@ -146,7 +147,8 @@ public:
UNFREEZE_DISPLAY,
SIGNAL,
CAPTURE_SCREEN,
- TURN_ELECTRON_BEAM_OFF
+ TURN_ELECTRON_BEAM_OFF,
+ TURN_ELECTRON_BEAM_ON
};
virtual status_t onTransact( uint32_t code,