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

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

Merge "Fix google-explicit-constructor warnings." am: a6b6252d am: 1676161c 

am: 316fa0ae

Change-Id: I43d1cc625834092f12adec5ff52d1565d1b91e23
parents f1e8aed4 316fa0ae

libs/input/SpriteController.h

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ private: 
        virtual ~SpriteImpl();



    public:

        SpriteImpl(const sp<SpriteController> controller);

        explicit SpriteImpl(const sp<SpriteController> controller);



        virtual void setIcon(const SpriteIcon& icon);

        virtual void setVisible(bool visible);

services/core/jni/com_android_server_input_InputApplicationHandle.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ namespace android { 


class NativeInputApplicationHandle : public InputApplicationHandle {

public:

    NativeInputApplicationHandle(jweak objWeak);

    explicit NativeInputApplicationHandle(jweak objWeak);

    virtual ~NativeInputApplicationHandle();



    jobject getInputApplicationHandleObjLocalRef(JNIEnv* env);