diff options
| author | Elliott Hughes <enh@google.com> | 2011-10-17 11:32:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-17 11:32:08 -0700 |
| commit | 090cb44b945bfe2711344a5331814bd6412ab437 (patch) | |
| tree | 53ec3dbad4348124bed96fed8500d77bffbb551d /include | |
| parent | 35e9fa48918924302cdb248ff5e816d697066bde (diff) | |
| parent | cb2de7182ee689cdb77242474def26938e852bf3 (diff) | |
| download | frameworks_native-090cb44b945bfe2711344a5331814bd6412ab437.zip frameworks_native-090cb44b945bfe2711344a5331814bd6412ab437.tar.gz frameworks_native-090cb44b945bfe2711344a5331814bd6412ab437.tar.bz2 | |
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
Diffstat (limited to 'include')
| -rw-r--r-- | include/surfaceflinger/ISurfaceComposer.h | 10 | ||||
| -rw-r--r-- | include/surfaceflinger/SurfaceComposerClient.h | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/include/surfaceflinger/ISurfaceComposer.h b/include/surfaceflinger/ISurfaceComposer.h index e7a33f1..5eb09c7 100644 --- a/include/surfaceflinger/ISurfaceComposer.h +++ b/include/surfaceflinger/ISurfaceComposer.h @@ -84,7 +84,11 @@ public: eOrientationUnchanged = 4, eOrientationSwapMask = 0x01 }; - + + enum { + eSynchronous = 0x01, + }; + enum { eElectronBeamAnimationOn = 0x01, eElectronBeamAnimationOff = 0x10 @@ -104,7 +108,7 @@ public: /* open/close transactions. requires ACCESS_SURFACE_FLINGER permission */ virtual void setTransactionState(const Vector<ComposerState>& state, - int orientation) = 0; + int orientation, uint32_t flags) = 0; /* signal that we're done booting. * Requires ACCESS_SURFACE_FLINGER permission @@ -143,8 +147,6 @@ public: GET_CBLK, SET_TRANSACTION_STATE, SET_ORIENTATION, - FREEZE_DISPLAY, - UNFREEZE_DISPLAY, CAPTURE_SCREEN, TURN_ELECTRON_BEAM_OFF, TURN_ELECTRON_BEAM_ON, diff --git a/include/surfaceflinger/SurfaceComposerClient.h b/include/surfaceflinger/SurfaceComposerClient.h index 14e5b23..8226abe 100644 --- a/include/surfaceflinger/SurfaceComposerClient.h +++ b/include/surfaceflinger/SurfaceComposerClient.h @@ -112,7 +112,7 @@ public: static void openGlobalTransaction(); //! Close a composer transaction on all active SurfaceComposerClients. - static void closeGlobalTransaction(); + static void closeGlobalTransaction(bool synchronous = false); //! Freeze the specified display but not transactions. static status_t freezeDisplay(DisplayID dpy, uint32_t flags = 0); |