Snap for 5048123 from b3ee06887f6458d307012f7a67460f19d4c334c6 to qt-release (c54dc03a) · Commits · e / os / platform_frameworks_native

services/inputflinger/InputApplication.h→include/input/InputApplication.h

+0 −0

File moved.

+8 −1

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@
		#include <utils/BitSet.h>

		namespace android {
		class Parcel;

		/*
		* Intermediate representation used to send input events and related signals.
		@@ -143,6 +144,7 @@ protected:
		virtual ~InputChannel();

		public:
		InputChannel() = default;
		InputChannel(const std::string& name, int fd);

		/* Creates a pair of input channels.
		@@ -183,9 +185,14 @@ public:
		/* Returns a new object that has a duplicate of this channel's fd. */
		sp<InputChannel> dup() const;

		status_t write(Parcel& out) const;
		status_t read(const Parcel& from);

		private:
		void setFd(int fd);

		std::string mName;
		int mFd;
		int mFd = -1;
		};

		/*

+5 −4

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@
		#include "InputApplication.h"

		namespace android {

		class Parcel;

		/*
		* Describes the properties of a window that can receive input.
		@@ -151,6 +151,9 @@ struct InputWindowInfo {
		bool supportsSplitTouch() const;

		bool overlaps(const InputWindowInfo* other) const;

		status_t write(Parcel& output) const;
		static InputWindowInfo read(const Parcel& from);
		};


		@@ -168,9 +171,7 @@ public:
		return mInfo;
		}

		inline sp<InputChannel> getInputChannel() const {
		return mInfo ? mInfo->inputChannel : nullptr;
		}
		sp<InputChannel> getInputChannel() const;

		inline std::string getName() const {
		return mInfo ? mInfo->name : "<invalid>";

+1 −1

Original line number	Diff line number	Diff line
		@@ -621,7 +621,7 @@ status_t FrameEventsDelta::unflatten(void const*& buffer, size_t& size,
		// ============================================================================

		FrameEventHistoryDelta& FrameEventHistoryDelta::operator=(
		FrameEventHistoryDelta&& src) {
		FrameEventHistoryDelta&& src) noexcept {
		mCompositorTiming = src.mCompositorTiming;

		if (CC_UNLIKELY(!mDeltas.empty())) {

+1 −1

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

		// Movable.
		FrameEventHistoryDelta(FrameEventHistoryDelta&& src) = default;
		FrameEventHistoryDelta& operator=(FrameEventHistoryDelta&& src);
		FrameEventHistoryDelta& operator=(FrameEventHistoryDelta&& src) noexcept;
		// Not copyable.
		FrameEventHistoryDelta(const FrameEventHistoryDelta& src) = delete;
		FrameEventHistoryDelta& operator=(