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

Commit 80109da9 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 am: 9a55c7ab 

am: 76b5c6b2

Change-Id: Id48300ec04692d040625176ce953e1f21e0bc6ae
parents 26ce864c 76b5c6b2

include/input/Input.h

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

class PooledInputEventFactory : public InputEventFactoryInterface {

public:

    PooledInputEventFactory(size_t maxPoolSize = 20);

    explicit PooledInputEventFactory(size_t maxPoolSize = 20);

    virtual ~PooledInputEventFactory();



    virtual KeyEvent* createKeyEvent();

include/input/KeyCharacterMap.h

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



        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) { }



            int32_t property;

libs/input/tests/TestHelpers.h

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



public:

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

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



protected:

    virtual ~DelayedTask() { }