am 4fbb8191: am caa81f0e: Merge "make sure to unlock the screenshot\'s buffer on destruction" into jb-mr2-dev

* commit '4fbb8191d8f92230e39f1c4541938d5f18247579':
  make sure to unlock the screenshot's buffer on destruction
This commit is contained in:
Mathias Agopian 2013-03-26 18:34:12 -07:00 committed by Android Git Automerger
commit 018c4e19b7
2 changed files with 5 additions and 0 deletions

View File

@ -170,6 +170,7 @@ private:
public:
ScreenshotClient();
~ScreenshotClient();
// frees the previous screenshot and capture a new one
status_t update(const sp<IBinder>& display);

View File

@ -627,6 +627,10 @@ ScreenshotClient::ScreenshotClient()
memset(&mBuffer, 0, sizeof(mBuffer));
}
ScreenshotClient::~ScreenshotClient() {
ScreenshotClient::release();
}
sp<CpuConsumer> ScreenshotClient::getCpuConsumer() const {
if (mCpuConsumer == NULL) {
mCpuConsumer = new CpuConsumer(1);