Snap for 9414774 from b8df0ef2ba05d46763fd6d15a52fb86b8deb6426 to udc-release (238af047) · Commits · e / os / android_frameworks_native

cmds/atrace/atrace.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ using hardware::atrace::V1_0::toString;

		using std::string;

		#define MAX_SYS_FILES 12
		#define MAX_SYS_FILES 13

		const char* k_traceTagsProperty = "debug.atrace.tags.enableflags";
		const char* k_userInitiatedTraceProperty = "debug.atrace.user_initiated";
		@@ -189,6 +189,8 @@ static const TracingCategory k_categories[] = {
		{ OPT, "events/f2fs/f2fs_sync_file_exit/enable" },
		{ OPT, "events/f2fs/f2fs_write_begin/enable" },
		{ OPT, "events/f2fs/f2fs_write_end/enable" },
		{ OPT, "events/f2fs/f2fs_iostat/enable" },
		{ OPT, "events/f2fs/f2fs_iostat_latency/enable" },
		{ OPT, "events/ext4/ext4_da_write_begin/enable" },
		{ OPT, "events/ext4/ext4_da_write_end/enable" },
		{ OPT, "events/ext4/ext4_sync_file_enter/enable" },

include/android/performance_hint.h

+0 −41

Original line number	Diff line number	Diff line
		@@ -87,36 +87,6 @@ typedef struct APerformanceHintManager APerformanceHintManager;
		*/
		typedef struct APerformanceHintSession APerformanceHintSession;

		/**
		* Hints for the session used by {@link APerformanceHint_sendHint} to signal upcoming changes
		* in the mode or workload.
		*/
		enum SessionHint {
		/**
		* This hint indicates a sudden increase in CPU workload intensity. It means
		* that this hint session needs extra CPU resources immediately to meet the
		* target duration for the current work cycle.
		*/
		CPU_LOAD_UP = 0,
		/**
		* This hint indicates a decrease in CPU workload intensity. It means that
		* this hint session can reduce CPU resources and still meet the target duration.
		*/
		CPU_LOAD_DOWN = 1,
		/*
		* This hint indicates an upcoming CPU workload that is completely changed and
		* unknown. It means that the hint session should reset CPU resources to a known
		* baseline to prepare for an arbitrary load, and must wake up if inactive.
		*/
		CPU_LOAD_RESET = 2,
		/*
		* This hint indicates that the most recent CPU workload is resuming after a
		* period of inactivity. It means that the hint session should allocate similar
		* CPU resources to what was used previously, and must wake up if inactive.
		*/
		CPU_LOAD_RESUME = 3,
		};

		/**
		* Acquire an instance of the performance hint manager.
		*
		@@ -189,17 +159,6 @@ int APerformanceHint_reportActualWorkDuration(
		void APerformanceHint_closeSession(
		APerformanceHintSession* session) __INTRODUCED_IN(__ANDROID_API_T__);

		/**
		* Sends performance hints to inform the hint session of changes in the workload.
		*
		* @param session The performance hint session instance to update.
		* @param hint The hint to send to the session.
		* @return 0 on success
		* EPIPE if communication with the system service has failed.
		*/
		int APerformanceHint_sendHint(
		APerformanceHintSession* session, int hint) __INTRODUCED_IN(__ANDROID_API_U__);

		__END_DECLS

		#endif // ANDROID_NATIVE_PERFORMANCE_HINT_H

include/private/performance_hint_private.h

+39 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,45 @@ __BEGIN_DECLS
		*/
		void APerformanceHint_setIHintManagerForTesting(void* iManager);

		/**
		* Hints for the session used to signal upcoming changes in the mode or workload.
		*/
		enum SessionHint {
		/**
		* This hint indicates a sudden increase in CPU workload intensity. It means
		* that this hint session needs extra CPU resources immediately to meet the
		* target duration for the current work cycle.
		*/
		CPU_LOAD_UP = 0,
		/**
		* This hint indicates a decrease in CPU workload intensity. It means that
		* this hint session can reduce CPU resources and still meet the target duration.
		*/
		CPU_LOAD_DOWN = 1,
		/*
		* This hint indicates an upcoming CPU workload that is completely changed and
		* unknown. It means that the hint session should reset CPU resources to a known
		* baseline to prepare for an arbitrary load, and must wake up if inactive.
		*/
		CPU_LOAD_RESET = 2,
		/*
		* This hint indicates that the most recent CPU workload is resuming after a
		* period of inactivity. It means that the hint session should allocate similar
		* CPU resources to what was used previously, and must wake up if inactive.
		*/
		CPU_LOAD_RESUME = 3,
		};

		/**
		* Sends performance hints to inform the hint session of changes in the workload.
		*
		* @param session The performance hint session instance to update.
		* @param hint The hint to send to the session.
		* @return 0 on success
		* EPIPE if communication with the system service has failed.
		*/
		int APerformanceHint_sendHint(void* session, int hint);

		__END_DECLS

		#endif // ANDROID_PRIVATE_NATIVE_PERFORMANCE_HINT_PRIVATE_H

services/inputflinger/reader/Android.bp

+3 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ cc_library_headers {
		"include",
		"mapper",
		"mapper/accumulator",
		"mapper/gestures",
		],
		}

		@@ -60,7 +61,9 @@ filegroup {
		"mapper/accumulator/MultiTouchMotionAccumulator.cpp",
		"mapper/accumulator/SingleTouchMotionAccumulator.cpp",
		"mapper/accumulator/TouchButtonAccumulator.cpp",
		"mapper/gestures/GestureConverter.cpp",
		"mapper/gestures/GesturesLogging.cpp",
		"mapper/gestures/HardwareStateConverter.cpp",
		],
		}

services/inputflinger/reader/include/InputDevice.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -403,7 +403,7 @@ public:
		inline status_t enableDevice() { return mEventHub->enableDevice(mId); }
		inline status_t disableDevice() { return mEventHub->disableDevice(mId); }

		inline const std::string getName() { return mDevice.getName(); }
		inline const std::string getName() const { return mDevice.getName(); }
		inline const std::string getDescriptor() { return mDevice.getDescriptor(); }
		inline bool isExternal() { return mDevice.isExternal(); }
		inline std::optional<uint8_t> getAssociatedDisplayPort() const {