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

Commit 22e68835 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix google-explicit-constructor warnings." am: caff47a0 am: 4a912c41 

am: ee1cd12a

* commit 'ee1cd12a':
  Fix google-explicit-constructor warnings.

Change-Id: I8d2df8b1bde854b19112d9790b5b92f9e413887c
parents e191d652 ee1cd12a

libs/gui/tests/SurfaceTextureClient_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -535,7 +535,7 @@ TEST_F(SurfaceTextureClientTest, DISABLED_SurfaceTextureSyncModeWaitRetire) { 
            return false;

        }

    public:

        MyThread(const sp<GLConsumer>& mST)

        explicit MyThread(const sp<GLConsumer>& mST)

            : mST(mST), mBufferRetired(false) {

            ctx = eglGetCurrentContext();

            sur = eglGetCurrentSurface(EGL_DRAW);

libs/gui/tests/SurfaceTextureGL_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ TEST_F(SurfaceTextureGLTest, DisconnectStressTest) { 


    class ProducerThread : public Thread {

    public:

        ProducerThread(const sp<ANativeWindow>& anw):

        explicit ProducerThread(const sp<ANativeWindow>& anw):

                mANW(anw) {

        }
@@ -620,7 +620,7 @@ TEST_F(SurfaceTextureGLTest, CroppedScalingMode) { 
TEST_F(SurfaceTextureGLTest, AbandonUnblocksDequeueBuffer) {

    class ProducerThread : public Thread {

    public:

        ProducerThread(const sp<ANativeWindow>& anw):

        explicit ProducerThread(const sp<ANativeWindow>& anw):

                mANW(anw),

                mDequeueError(NO_ERROR) {

        }