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

Commit 189b270a authored by Jamie Gennis's avatar Jamie Gennis Committed by Android (Google) Code Review
Browse files

Merge "stop using a deprecated SurfaceTextureClient ctor"

parents 603b6c19 c911ea53

libs/gui/tests/SurfaceTextureClient_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ protected: 
                testInfo->name());



        mST = new SurfaceTexture(123);

        mSTC = new SurfaceTextureClient(mST);

        mSTC = new SurfaceTextureClient(mST->getBufferQueue());

        mANW = mSTC;



        // We need a valid GL context so we can test updateTexImage()
@@ -686,7 +686,7 @@ protected: 


        for (int i = 0; i < NUM_SURFACE_TEXTURES; i++) {

            sp<SurfaceTexture> st(new SurfaceTexture(i));

            sp<SurfaceTextureClient> stc(new SurfaceTextureClient(st));

            sp<SurfaceTextureClient> stc(new SurfaceTextureClient(st->getBufferQueue()));

            mEglSurfaces[i] = eglCreateWindowSurface(mEglDisplay, myConfig,

                    static_cast<ANativeWindow*>(stc.get()), NULL);

            ASSERT_EQ(EGL_SUCCESS, eglGetError());

libs/gui/tests/SurfaceTexture_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ protected: 
    virtual void SetUp() {

        GLTest::SetUp();

        mST = new SurfaceTexture(TEX_ID);

        mSTC = new SurfaceTextureClient(mST);

        mSTC = new SurfaceTextureClient(mST->getBufferQueue());

        mANW = mSTC;

        mTextureRenderer = new TextureRenderer(TEX_ID, mST);

        ASSERT_NO_FATAL_FAILURE(mTextureRenderer->SetUp());