Merge "Remove freezeDisplay(), which is no-op."

This commit is contained in:
Jeff Brown 2012-07-16 15:53:07 -07:00 committed by Android (Google) Code Review
commit 74bf072147
2 changed files with 0 additions and 20 deletions

View File

@ -93,12 +93,6 @@ public:
//! Close a composer transaction on all active SurfaceComposerClients. //! Close a composer transaction on all active SurfaceComposerClients.
static void closeGlobalTransaction(bool synchronous = false); static void closeGlobalTransaction(bool synchronous = false);
//! Freeze the specified display but not transactions.
static status_t freezeDisplay(DisplayID dpy, uint32_t flags = 0);
//! Resume updates on the specified display.
static status_t unfreezeDisplay(DisplayID dpy, uint32_t flags = 0);
//! Set the orientation of the given display //! Set the orientation of the given display
static int setOrientation(DisplayID dpy, int orientation, uint32_t flags); static int setOrientation(DisplayID dpy, int orientation, uint32_t flags);

View File

@ -542,20 +542,6 @@ ssize_t SurfaceComposerClient::getNumberOfDisplays()
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
status_t SurfaceComposerClient::freezeDisplay(DisplayID dpy, uint32_t flags)
{
// This has been made a no-op because it can cause Gralloc buffer deadlocks.
return NO_ERROR;
}
status_t SurfaceComposerClient::unfreezeDisplay(DisplayID dpy, uint32_t flags)
{
// This has been made a no-op because it can cause Gralloc buffer deadlocks.
return NO_ERROR;
}
// ----------------------------------------------------------------------------
ScreenshotClient::ScreenshotClient() ScreenshotClient::ScreenshotClient()
: mWidth(0), mHeight(0), mFormat(PIXEL_FORMAT_NONE) { : mWidth(0), mHeight(0), mFormat(PIXEL_FORMAT_NONE) {
} }