diff options
| author | Joe Onorato <joeo@google.com> | 2010-10-12 14:46:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-12 14:46:23 -0700 |
| commit | 9a12a3c8d4bb20042cf69e07d268e3a04ac71f96 (patch) | |
| tree | 8077adbd81854c5b5571b57a5f9d20f28d92ca75 /include | |
| parent | 090ac9f7dd883aa75c899745182471d409a2b762 (diff) | |
| parent | ba799098608c7be8ff1e18adfa7dc1f452205a7e (diff) | |
| download | frameworks_base-9a12a3c8d4bb20042cf69e07d268e3a04ac71f96.zip frameworks_base-9a12a3c8d4bb20042cf69e07d268e3a04ac71f96.tar.gz frameworks_base-9a12a3c8d4bb20042cf69e07d268e3a04ac71f96.tar.bz2 | |
am ba799098: Merge changes I76513387,I335fb671 into gingerbread
Merge commit 'ba799098608c7be8ff1e18adfa7dc1f452205a7e' into gingerbread-plus-aosp
* commit 'ba799098608c7be8ff1e18adfa7dc1f452205a7e':
Remove dead code, and make the animation a setting.
turn off the electron beam
Diffstat (limited to 'include')
| -rw-r--r-- | include/surfaceflinger/ISurfaceComposer.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/surfaceflinger/ISurfaceComposer.h b/include/surfaceflinger/ISurfaceComposer.h index 6533600..1a1821c 100644 --- a/include/surfaceflinger/ISurfaceComposer.h +++ b/include/surfaceflinger/ISurfaceComposer.h @@ -118,6 +118,8 @@ public: uint32_t* width, uint32_t* height, PixelFormat* format, uint32_t reqWidth, uint32_t reqHeight) = 0; + virtual status_t turnElectronBeamOff(int32_t mode) = 0; + /* Signal surfaceflinger that there might be some work to do * This is an ASYNCHRONOUS call. */ @@ -142,7 +144,8 @@ public: FREEZE_DISPLAY, UNFREEZE_DISPLAY, SIGNAL, - CAPTURE_SCREEN + CAPTURE_SCREEN, + TURN_ELECTRON_BEAM_OFF }; virtual status_t onTransact( uint32_t code, |