Merge "don't report an error when disconnecting from an abandoned surfacetexture" into ics-mr1
This commit is contained in:
commit
7723773df3
@ -646,8 +646,9 @@ status_t SurfaceTexture::disconnect(int api) {
|
|||||||
Mutex::Autolock lock(mMutex);
|
Mutex::Autolock lock(mMutex);
|
||||||
|
|
||||||
if (mAbandoned) {
|
if (mAbandoned) {
|
||||||
ST_LOGE("disconnect: SurfaceTexture has been abandoned!");
|
// it is not really an error to disconnect after the surface
|
||||||
return NO_INIT;
|
// has been abandoned, it should just be a no-op.
|
||||||
|
return NO_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
int err = NO_ERROR;
|
int err = NO_ERROR;
|
||||||
|
Loading…
Reference in New Issue
Block a user