diff options
| author | Mathias Agopian <mathias@google.com> | 2011-11-21 21:08:47 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-21 21:08:47 -0800 |
| commit | 6b7c5da722128a89fb939bf3677d9cc04421e29f (patch) | |
| tree | 3e20c0cffe208a84843bab653b4af0aace91af2c /libs/gui | |
| parent | 93a098fb6eb709aa404f1fb9febabddd2c35e785 (diff) | |
| parent | 82ac31f9fa40265efce7cfc9b06d1431d9f32535 (diff) | |
| download | frameworks_native-6b7c5da722128a89fb939bf3677d9cc04421e29f.zip frameworks_native-6b7c5da722128a89fb939bf3677d9cc04421e29f.tar.gz frameworks_native-6b7c5da722128a89fb939bf3677d9cc04421e29f.tar.bz2 | |
am cc4d02e0: am 07a2d831: Merge "don\'t report an error when disconnecting from an abandoned surfacetexture" into ics-mr1
* commit 'cc4d02e0cbb99341a0508838c88eeef53180fdfd':
don't report an error when disconnecting from an abandoned surfacetexture
Diffstat (limited to 'libs/gui')
| -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 4c587d2..b4d01a9 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; |