Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b7c5da7 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

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

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
parents 93a098fb 82ac31f9

libs/gui/SurfaceTexture.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -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;