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 /services/surfaceflinger/SurfaceFlinger.h | |
| 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 'services/surfaceflinger/SurfaceFlinger.h')
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h index 732e57e..3470d87 100644 --- a/services/surfaceflinger/SurfaceFlinger.h +++ b/services/surfaceflinger/SurfaceFlinger.h @@ -141,6 +141,7 @@ public: int getHeight() const; const DisplayHardware& displayHardware() const; + DisplayHardware& editDisplayHardware(); const Transform& transform() const; EGLDisplay getEGLDisplay() const; @@ -200,6 +201,7 @@ public: PixelFormat* format, uint32_t reqWidth, uint32_t reqHeight); + virtual status_t turnElectronBeamOff(int32_t mode); void screenReleased(DisplayID dpy); void screenAcquired(DisplayID dpy); @@ -326,6 +328,8 @@ private: uint32_t* width, uint32_t* height, PixelFormat* format, uint32_t reqWidth = 0, uint32_t reqHeight = 0); + status_t turnElectronBeamOffImplLocked(); + friend class FreezeLock; sp<FreezeLock> getFreezeLock() const; inline void incFreezeCount() { |