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

Commit 4a912c41 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

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

Change-Id: I845f4c825d460ed1590a3ad4304b4686fadd9f7a
parents 7a52b757 caff47a0

libs/gui/tests/SurfaceTextureClient_test.cpp

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

            return false;

        }

        }

    public:

    public:

        MyThread(const sp<GLConsumer>& mST)

        explicit MyThread(const sp<GLConsumer>& mST)

            : mST(mST), mBufferRetired(false) {

            : mST(mST), mBufferRetired(false) {

            ctx = eglGetCurrentContext();

            ctx = eglGetCurrentContext();

            sur = eglGetCurrentSurface(EGL_DRAW);

            sur = eglGetCurrentSurface(EGL_DRAW);

libs/gui/tests/SurfaceTextureGL_test.cpp

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




    class ProducerThread : public Thread {

    class ProducerThread : public Thread {

    public:

    public:

        ProducerThread(const sp<ANativeWindow>& anw):

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

                mANW(anw) {

                mANW(anw) {

        }

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

TEST_F(SurfaceTextureGLTest, AbandonUnblocksDequeueBuffer) {

    class ProducerThread : public Thread {

    class ProducerThread : public Thread {

    public:

    public:

        ProducerThread(const sp<ANativeWindow>& anw):

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

                mANW(anw),

                mANW(anw),

                mDequeueError(NO_ERROR) {

                mDequeueError(NO_ERROR) {

        }

        }