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

Commit 9a55c7ab authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix/suppress google-explicit-constructor warnings" 

am: aad7e1cc

Change-Id: Ia7329a5ad05ec24c61df4fdb29e49ceeb2e5b244
parents 820eb81c aad7e1cc

include/input/Input.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -661,7 +661,7 @@ private: 
 */

 */

class PooledInputEventFactory : public InputEventFactoryInterface {

class PooledInputEventFactory : public InputEventFactoryInterface {

public:

public:

    PooledInputEventFactory(size_t maxPoolSize = 20);

    explicit PooledInputEventFactory(size_t maxPoolSize = 20);

    virtual ~PooledInputEventFactory();

    virtual ~PooledInputEventFactory();





    virtual KeyEvent* createKeyEvent();

    virtual KeyEvent* createKeyEvent();

include/input/KeyCharacterMap.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -196,7 +196,7 @@ private: 
        };

        };





        struct Property {

        struct Property {

            inline Property(int32_t property = 0, int32_t metaState = 0) :

            inline explicit Property(int32_t property = 0, int32_t metaState = 0) :

                    property(property), metaState(metaState) { }

                    property(property), metaState(metaState) { }





            int32_t property;

            int32_t property;

libs/input/tests/TestHelpers.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -62,7 +62,7 @@ class DelayedTask : public Thread { 
    int mDelayMillis;

    int mDelayMillis;





public:

public:

    DelayedTask(int delayMillis) : mDelayMillis(delayMillis) { }

    explicit DelayedTask(int delayMillis) : mDelayMillis(delayMillis) { }





protected:

protected:

    virtual ~DelayedTask() { }

    virtual ~DelayedTask() { }