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

Commit 6285c6cf authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "attempt to fix bug 5313580" into ics-mr1

parents 3b244a74 a36bcd53

include/gui/SurfaceTextureClient.h

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




protected:

protected:

    SurfaceTextureClient();

    SurfaceTextureClient();

    virtual ~SurfaceTextureClient();

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

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





private:

private:

libs/gui/SurfaceTextureClient.cpp

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

    SurfaceTextureClient::init();

}

}





SurfaceTextureClient::~SurfaceTextureClient() {

    if (mConnectedToCpu) {

        SurfaceTextureClient::disconnect(NATIVE_WINDOW_API_CPU);

    }

}



void SurfaceTextureClient::init() {

void SurfaceTextureClient::init() {

    // Initialize the ANativeWindow function pointers.

    // Initialize the ANativeWindow function pointers.

    ANativeWindow::setSwapInterval  = hook_setSwapInterval;

    ANativeWindow::setSwapInterval  = hook_setSwapInterval;