ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "don't report an error when disconnecting from an abandoned surfacetexture" into ics-mr1

Browse Source
This commit is contained in:
Mathias Agopian 2011-11-21 17:57:31 -08:00 committed by Android (Google) Code Review
commit 7723773df3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/gui/SurfaceTexture.cpp
View File

@ -646,8 +646,9 @@ status_t SurfaceTexture::disconnect(int api) {
Mutex::Autolock lock(mMutex);
if (mAbandoned) {
ST_LOGE("disconnect: SurfaceTexture has been abandoned!");
return NO_INIT;
// it is not really an error to disconnect after the surface
// has been abandoned, it should just be a no-op.
return NO_ERROR;
}
int err = NO_ERROR;