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

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

am 4d71053b: Merge "attempt to fix bug 5313580" into ics-mr1 

* commit '4d71053b0728b248d80d7d5a098df459722e2be0':
  attempt to fix bug 5313580
parents 708e9b4b 6285c6cf

include/gui/SurfaceTextureClient.h

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ public: 


protected:

    SurfaceTextureClient();

    virtual ~SurfaceTextureClient();

    void setISurfaceTexture(const sp<ISurfaceTexture>& surfaceTexture);



private:

libs/gui/SurfaceTextureClient.cpp

+6 −0
Original line number Diff line number Diff line
@@ -36,6 +36,12 @@ SurfaceTextureClient::SurfaceTextureClient() { 
    SurfaceTextureClient::init();

}



SurfaceTextureClient::~SurfaceTextureClient() {

    if (mConnectedToCpu) {

        SurfaceTextureClient::disconnect(NATIVE_WINDOW_API_CPU);

    }

}



void SurfaceTextureClient::init() {

    // Initialize the ANativeWindow function pointers.

    ANativeWindow::setSwapInterval  = hook_setSwapInterval;