Merge "Fix google-explicit-constructor warnings in inputflinger." (6fabbc60) · Commits · e / os / android_frameworks_native

services/inputflinger/InputDispatcher.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -455,7 +455,7 @@ private:
	};		};

	struct ConfigurationChangedEntry : EventEntry {		struct ConfigurationChangedEntry : EventEntry {
	ConfigurationChangedEntry(nsecs_t eventTime);		explicit ConfigurationChangedEntry(nsecs_t eventTime);
	virtual void appendDescription(String8& msg) const;		virtual void appendDescription(String8& msg) const;

	protected:		protected:
	@@ -591,7 +591,7 @@ private:

	class Connection;		class Connection;
	struct CommandEntry : Link<CommandEntry> {		struct CommandEntry : Link<CommandEntry> {
	CommandEntry(Command command);		explicit CommandEntry(Command command);
	~CommandEntry();		~CommandEntry();

	Command command;		Command command;

services/inputflinger/InputListener.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -40,7 +40,7 @@ struct NotifyConfigurationChangedArgs : public NotifyArgs {

	inline NotifyConfigurationChangedArgs() { }		inline NotifyConfigurationChangedArgs() { }

	NotifyConfigurationChangedArgs(nsecs_t eventTime);		explicit NotifyConfigurationChangedArgs(nsecs_t eventTime);

	NotifyConfigurationChangedArgs(const NotifyConfigurationChangedArgs& other);		NotifyConfigurationChangedArgs(const NotifyConfigurationChangedArgs& other);

	@@ -178,7 +178,7 @@ protected:
	virtual ~QueuedInputListener();		virtual ~QueuedInputListener();

	public:		public:
	QueuedInputListener(const sp<InputListenerInterface>& innerListener);		explicit QueuedInputListener(const sp<InputListenerInterface>& innerListener);

	virtual void notifyConfigurationChanged(const NotifyConfigurationChangedArgs* args);		virtual void notifyConfigurationChanged(const NotifyConfigurationChangedArgs* args);
	virtual void notifyKey(const NotifyKeyArgs* args);		virtual void notifyKey(const NotifyKeyArgs* args);

services/inputflinger/InputReader.h

+12 −12

Original line number	Original line	Diff line number	Diff line
	@@ -484,7 +484,7 @@ protected:
	InputReader* mReader;		InputReader* mReader;

	public:		public:
	ContextImpl(InputReader* reader);		explicit ContextImpl(InputReader* reader);

	virtual void updateGlobalMetaState();		virtual void updateGlobalMetaState();
	virtual int32_t getGlobalMetaState();		virtual int32_t getGlobalMetaState();
	@@ -568,7 +568,7 @@ private:
	/* Reads raw events from the event hub and processes them, endlessly. */		/* Reads raw events from the event hub and processes them, endlessly. */
	class InputReaderThread : public Thread {		class InputReaderThread : public Thread {
	public:		public:
	InputReaderThread(const sp<InputReaderInterface>& reader);		explicit InputReaderThread(const sp<InputReaderInterface>& reader);
	virtual ~InputReaderThread();		virtual ~InputReaderThread();

	private:		private:
	@@ -1007,7 +1007,7 @@ private:
	*/		*/
	class InputMapper {		class InputMapper {
	public:		public:
	InputMapper(InputDevice* device);		explicit InputMapper(InputDevice* device);
	virtual ~InputMapper();		virtual ~InputMapper();

	inline InputDevice* getDevice() { return mDevice; }		inline InputDevice* getDevice() { return mDevice; }
	@@ -1058,7 +1058,7 @@ protected:

	class SwitchInputMapper : public InputMapper {		class SwitchInputMapper : public InputMapper {
	public:		public:
	SwitchInputMapper(InputDevice* device);		explicit SwitchInputMapper(InputDevice* device);
	virtual ~SwitchInputMapper();		virtual ~SwitchInputMapper();

	virtual uint32_t getSources();		virtual uint32_t getSources();
	@@ -1078,7 +1078,7 @@ private:

	class VibratorInputMapper : public InputMapper {		class VibratorInputMapper : public InputMapper {
	public:		public:
	VibratorInputMapper(InputDevice* device);		explicit VibratorInputMapper(InputDevice* device);
	virtual ~VibratorInputMapper();		virtual ~VibratorInputMapper();

	virtual uint32_t getSources();		virtual uint32_t getSources();
	@@ -1178,7 +1178,7 @@ private:

	class CursorInputMapper : public InputMapper {		class CursorInputMapper : public InputMapper {
	public:		public:
	CursorInputMapper(InputDevice* device);		explicit CursorInputMapper(InputDevice* device);
	virtual ~CursorInputMapper();		virtual ~CursorInputMapper();

	virtual uint32_t getSources();		virtual uint32_t getSources();
	@@ -1243,7 +1243,7 @@ private:

	class RotaryEncoderInputMapper : public InputMapper {		class RotaryEncoderInputMapper : public InputMapper {
	public:		public:
	RotaryEncoderInputMapper(InputDevice* device);		explicit RotaryEncoderInputMapper(InputDevice* device);
	virtual ~RotaryEncoderInputMapper();		virtual ~RotaryEncoderInputMapper();

	virtual uint32_t getSources();		virtual uint32_t getSources();
	@@ -1264,7 +1264,7 @@ private:

	class TouchInputMapper : public InputMapper {		class TouchInputMapper : public InputMapper {
	public:		public:
	TouchInputMapper(InputDevice* device);		explicit TouchInputMapper(InputDevice* device);
	virtual ~TouchInputMapper();		virtual ~TouchInputMapper();

	virtual uint32_t getSources();		virtual uint32_t getSources();
	@@ -1887,7 +1887,7 @@ private:

	class SingleTouchInputMapper : public TouchInputMapper {		class SingleTouchInputMapper : public TouchInputMapper {
	public:		public:
	SingleTouchInputMapper(InputDevice* device);		explicit SingleTouchInputMapper(InputDevice* device);
	virtual ~SingleTouchInputMapper();		virtual ~SingleTouchInputMapper();

	virtual void reset(nsecs_t when);		virtual void reset(nsecs_t when);
	@@ -1905,7 +1905,7 @@ private:

	class MultiTouchInputMapper : public TouchInputMapper {		class MultiTouchInputMapper : public TouchInputMapper {
	public:		public:
	MultiTouchInputMapper(InputDevice* device);		explicit MultiTouchInputMapper(InputDevice* device);
	virtual ~MultiTouchInputMapper();		virtual ~MultiTouchInputMapper();

	virtual void reset(nsecs_t when);		virtual void reset(nsecs_t when);
	@@ -1926,7 +1926,7 @@ private:

	class ExternalStylusInputMapper : public InputMapper {		class ExternalStylusInputMapper : public InputMapper {
	public:		public:
	ExternalStylusInputMapper(InputDevice* device);		explicit ExternalStylusInputMapper(InputDevice* device);
	virtual ~ExternalStylusInputMapper() = default;		virtual ~ExternalStylusInputMapper() = default;

	virtual uint32_t getSources();		virtual uint32_t getSources();
	@@ -1948,7 +1948,7 @@ private:

	class JoystickInputMapper : public InputMapper {		class JoystickInputMapper : public InputMapper {
	public:		public:
	JoystickInputMapper(InputDevice* device);		explicit JoystickInputMapper(InputDevice* device);
	virtual ~JoystickInputMapper();		virtual ~JoystickInputMapper();

	virtual uint32_t getSources();		virtual uint32_t getSources();

services/inputflinger/InputWindow.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -196,7 +196,7 @@ public:
	void releaseInfo();		void releaseInfo();

	protected:		protected:
	InputWindowHandle(const sp<InputApplicationHandle>& inputApplicationHandle);		explicit InputWindowHandle(const sp<InputApplicationHandle>& inputApplicationHandle);
	virtual ~InputWindowHandle();		virtual ~InputWindowHandle();

	InputWindowInfo* mInfo;		InputWindowInfo* mInfo;

services/inputflinger/host/InputDriver.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -82,7 +82,7 @@ public:

	class InputDriver : public InputDriverInterface {		class InputDriver : public InputDriverInterface {
	public:		public:
	InputDriver(const char* name);		explicit InputDriver(const char* name);
	virtual ~InputDriver() = default;		virtual ~InputDriver() = default;

	virtual void init() override;		virtual void init() override;