Commit 82ac31f9 authored Nov 21, 2011 by Mathias Agopian Committed by Android Git Automerger Nov 21, 2011

am 07a2d831: Merge "don\'t report an error when disconnecting from an...

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

parents 4869991f 7723773d

libs/gui/SurfaceTexture.cpp

+3 −2

Original line number	Diff line number	Diff line
		@@ -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;