Snap for 9459940 from c2a77771f41f3b94fa9f36cdc4c037df08aed450 to udc-release (dd3f2927) · Commits · e / os / android_frameworks_native

cmds/dumpstate/dumpstate.rc

+3 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@ service dumpstate /system/bin/dumpstate -s
		socket dumpstate stream 0660 shell log
		disabled
		oneshot
		capabilities CHOWN DAC_OVERRIDE DAC_READ_SEARCH FOWNER FSETID KILL NET_ADMIN NET_RAW SETGID SETUID SYS_PTRACE SYS_RESOURCE BLOCK_SUSPEND SYSLOG

		# dumpstatez generates a zipped bugreport but also uses a socket to print the file location once
		# it is finished.
		@@ -16,9 +17,11 @@ service dumpstatez /system/bin/dumpstate -S
		class main
		disabled
		oneshot
		capabilities CHOWN DAC_OVERRIDE DAC_READ_SEARCH FOWNER FSETID KILL NET_ADMIN NET_RAW SETGID SETUID SYS_PTRACE SYS_RESOURCE BLOCK_SUSPEND SYSLOG

		# bugreportd starts dumpstate binder service and makes it wait for a listener to connect.
		service bugreportd /system/bin/dumpstate -w
		class main
		disabled
		oneshot
		capabilities CHOWN DAC_OVERRIDE DAC_READ_SEARCH FOWNER FSETID KILL NET_ADMIN NET_RAW SETGID SETUID SYS_PTRACE SYS_RESOURCE BLOCK_SUSPEND SYSLOG

+8 −0

Original line number	Diff line number	Diff line
		@@ -870,6 +870,14 @@ enum AMotionClassification : uint32_t {
		* The current event stream represents the user swiping with two fingers on a touchpad.
		*/
		AMOTION_EVENT_CLASSIFICATION_TWO_FINGER_SWIPE = 3,
		/**
		* Classification constant: multi-finger swipe.
		*
		* The current event stream represents the user swiping with three or more fingers on a
		* touchpad. Unlike two-finger swipes, these are only to be handled by the system UI, which is
		* why they have a separate constant from two-finger swipes.
		*/
		AMOTION_EVENT_CLASSIFICATION_MULTI_FINGER_SWIPE = 4,
		};

		/**

+6 −0

Original line number	Diff line number	Diff line
		@@ -302,6 +302,12 @@ enum class MotionClassification : uint8_t {
		* The current gesture represents the user swiping with two fingers on a touchpad.
		*/
		TWO_FINGER_SWIPE = AMOTION_EVENT_CLASSIFICATION_TWO_FINGER_SWIPE,
		/**
		* The current gesture represents the user swiping with three or more fingers on a touchpad.
		* Unlike two-finger swipes, these are only to be handled by the system UI, which is why they
		* have a separate constant from two-finger swipes.
		*/
		MULTI_FINGER_SWIPE = AMOTION_EVENT_CLASSIFICATION_MULTI_FINGER_SWIPE,
		};

		/**

+1 −6

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@
		#include <vector>

		#include <android/os/IInputConstants.h>
		#include "android/hardware/input/InputDeviceCountryCode.h"

		namespace android {

		@@ -236,9 +235,7 @@ public:

		void initialize(int32_t id, int32_t generation, int32_t controllerNumber,
		const InputDeviceIdentifier& identifier, const std::string& alias,
		bool isExternal, bool hasMic,
		hardware::input::InputDeviceCountryCode countryCode =
		hardware::input::InputDeviceCountryCode::INVALID);
		bool isExternal, bool hasMic);

		inline int32_t getId() const { return mId; }
		inline int32_t getControllerNumber() const { return mControllerNumber; }
		@@ -250,7 +247,6 @@ public:
		}
		inline bool isExternal() const { return mIsExternal; }
		inline bool hasMic() const { return mHasMic; }
		inline hardware::input::InputDeviceCountryCode getCountryCode() const { return mCountryCode; }
		inline uint32_t getSources() const { return mSources; }

		const MotionRange* getMotionRange(int32_t axis, uint32_t source) const;
		@@ -310,7 +306,6 @@ private:
		std::string mAlias;
		bool mIsExternal;
		bool mHasMic;
		hardware::input::InputDeviceCountryCode mCountryCode;
		std::optional<KeyboardLayoutInfo> mKeyboardLayoutInfo;
		uint32_t mSources;
		int32_t mKeyboardType;

+1 −0

Original line number	Diff line number	Diff line
		@@ -100,6 +100,7 @@ cc_test {
		"binderBinderUnitTest.cpp",
		"binderStatusUnitTest.cpp",
		"binderMemoryHeapBaseUnitTest.cpp",
		"binderRecordedTransactionTest.cpp",
		],
		shared_libs: [
		"libbinder",