diff options
| author | Mathias Agopian <mathias@google.com> | 2011-11-21 18:00:52 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-21 18:00:52 -0800 |
| commit | cc4d02e0cbb99341a0508838c88eeef53180fdfd (patch) | |
| tree | 7b120ba029a7efaea3780ddad4149992dc303496 /libs/gui/SurfaceTexture.cpp | |
| parent | 8390cf39f8a4f74f7baa91d23cba06894a3fb9b5 (diff) | |
| parent | 07a2d831903774e07c1c6b6dd5c7c06bf8ca176a (diff) | |
| download | frameworks_base-cc4d02e0cbb99341a0508838c88eeef53180fdfd.zip frameworks_base-cc4d02e0cbb99341a0508838c88eeef53180fdfd.tar.gz frameworks_base-cc4d02e0cbb99341a0508838c88eeef53180fdfd.tar.bz2 | |
am 07a2d831: Merge "don\'t report an error when disconnecting from an abandoned surfacetexture" into ics-mr1
* commit '07a2d831903774e07c1c6b6dd5c7c06bf8ca176a':
don't report an error when disconnecting from an abandoned surfacetexture
Diffstat (limited to 'libs/gui/SurfaceTexture.cpp')
| -rw-r--r-- | libs/gui/SurfaceTexture.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp index d4fabd9..beb23f6 100644 --- a/libs/gui/SurfaceTexture.cpp +++ b/libs/gui/SurfaceTexture.cpp @@ -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; |