diff options
| author | Jamie Gennis <jgennis@google.com> | 2011-10-17 11:31:39 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-17 11:31:39 -0700 |
| commit | 7f7362c02bcde8750e24781f5c7199f9551301c5 (patch) | |
| tree | 83be1a0caf529baec9f7cd21870f5a6329caa182 /include | |
| parent | bddddf47291a1d93a6907ca943fb299d775fd9c0 (diff) | |
| parent | de14ecaebcb958f542f50cff08109926aad2c685 (diff) | |
| download | frameworks_base-7f7362c02bcde8750e24781f5c7199f9551301c5.zip frameworks_base-7f7362c02bcde8750e24781f5c7199f9551301c5.tar.gz frameworks_base-7f7362c02bcde8750e24781f5c7199f9551301c5.tar.bz2 | |
Merge changes I4e5ff00c,Id5e3ca1d,I97cbba61
* changes:
SurfaceFlinger: Remove display freezing code
SurfaceFlinger: add some layer update tests
SurfaceFlinger: make sync transactions explicit
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 ea022a6..1242e49 100644 --- a/include/surfaceflinger/ISurfaceComposer.h +++ b/include/surfaceflinger/ISurfaceComposer.h @@ -83,7 +83,11 @@ public: eOrientationUnchanged = 4, eOrientationSwapMask = 0x01 }; - + + enum { + eSynchronous = 0x01, + }; + enum { eElectronBeamAnimationOn = 0x01, eElectronBeamAnimationOff = 0x10 @@ -103,7 +107,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 @@ -142,8 +146,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); |