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

Commit 5229d8f5 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android (Google) Code Review
Browse files

Merge "frameworks/native: Make Thread::run threadName argument required" into nyc-dev

parents f7f2651e 83b1e685

libs/gui/ConsumerBase.cpp

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ ConsumerBase::ConsumerBase(const sp<IGraphicBufferConsumer>& bufferQueue, bool c 
    }



    mMessageThread = new MessageThread(this);

    mMessageThread->run();

    mMessageThread->run(mName);

}



ConsumerBase::~ConsumerBase() {

libs/gui/tests/SurfaceTextureClient_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ TEST_F(SurfaceTextureClientTest, DISABLED_SurfaceTextureSyncModeWaitRetire) { 


    ASSERT_EQ(OK, native_window_dequeue_buffer_and_wait(mANW.get(), &buf[0]));

    ASSERT_EQ(OK, mANW->queueBuffer(mANW.get(), buf[0], -1));

    thread->run();

    thread->run("MyThread");

    ASSERT_EQ(OK, native_window_dequeue_buffer_and_wait(mANW.get(), &buf[1]));

    ASSERT_EQ(OK, mANW->queueBuffer(mANW.get(), buf[1], -1));

    //ASSERT_EQ(OK, native_window_dequeue_buffer_and_wait(mANW.get(), &buf[2]));

libs/gui/tests/SurfaceTextureGLThreadToGL.h

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ protected: 
        mProducerThread = producerThread;

        producerThread->setEglObjects(mEglDisplay, mProducerEglSurface,

                mProducerEglContext);

        producerThread->run();

        producerThread->run("ProducerThread");

    }



    sp<ProducerThread> mProducerThread;

libs/gui/tests/SurfaceTextureGL_test.cpp

+3 −3
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ TEST_F(SurfaceTextureGLTest, TexturingFromCpuFilledYV12BuffersRepeatedly) { 
    };



    sp<Thread> pt(new ProducerThread(mANW, testPixels));

    pt->run();

    pt->run("ProducerThread");



    glViewport(0, 0, texWidth, texHeight);
@@ -484,7 +484,7 @@ TEST_F(SurfaceTextureGLTest, DisconnectStressTest) { 




    sp<Thread> pt(new ProducerThread(mANW));

    pt->run();

    pt->run("ProducerThread");



    // eat a frame so GLConsumer will own an at least one slot

    dw->waitForFrame();
@@ -681,7 +681,7 @@ TEST_F(SurfaceTextureGLTest, AbandonUnblocksDequeueBuffer) { 
    };



    sp<Thread> pt(new ProducerThread(mANW));

    pt->run();

    pt->run("ProducerThread");



    mFW->waitForFrame();

    mFW->waitForFrame();

opengl/libs/EGL/egl_cache.cpp

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ void egl_cache_t::setBlob(const void* key, EGLsizeiANDROID keySize, 
            // running, so there's no need to keep a ref around.

            sp<Thread> deferredSaveThread(new DeferredSaveThread());

            mSavePending = true;

            deferredSaveThread->run();

            deferredSaveThread->run("DeferredSaveThread");

        }

    }

}