diff options
| author | Joe Onorato <joeo@google.com> | 2010-10-13 23:34:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-13 23:34:21 -0700 |
| commit | eb86aaaab34687a77454fa130b08788db1317d74 (patch) | |
| tree | 6a0b8bd8dc7d3bb45511902d5d6fba012a3c8b43 /include/surfaceflinger | |
| parent | 4afdf666fdb034834c48445570ed9d6f4133fc71 (diff) | |
| parent | 9a12a3c8d4bb20042cf69e07d268e3a04ac71f96 (diff) | |
| download | frameworks_base-eb86aaaab34687a77454fa130b08788db1317d74.zip frameworks_base-eb86aaaab34687a77454fa130b08788db1317d74.tar.gz frameworks_base-eb86aaaab34687a77454fa130b08788db1317d74.tar.bz2 | |
am 9a12a3c8: am ba799098: Merge changes I76513387,I335fb671 into gingerbread
Merge commit '9a12a3c8d4bb20042cf69e07d268e3a04ac71f96'
* commit '9a12a3c8d4bb20042cf69e07d268e3a04ac71f96':
Remove dead code, and make the animation a setting.
turn off the electron beam
Diffstat (limited to 'include/surfaceflinger')
| -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 b181781..ac69a06 100644 --- a/include/surfaceflinger/ISurfaceComposer.h +++ b/include/surfaceflinger/ISurfaceComposer.h @@ -119,6 +119,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. */ @@ -143,7 +145,8 @@ public: FREEZE_DISPLAY, UNFREEZE_DISPLAY, SIGNAL, - CAPTURE_SCREEN + CAPTURE_SCREEN, + TURN_ELECTRON_BEAM_OFF }; virtual status_t onTransact( uint32_t code, |