Snap for 12559614 from 4eb5f9f5e38e26c064887eebca791a80dbec9759 to 25Q1-release (de00ae18) · Commits · e / os / android_frameworks_native

include/input/InputConsumerNoResampling.h

+8 −7

Original line number	Diff line number	Diff line
		@@ -211,16 +211,17 @@ private:
		* `consumeBatchedInputEvents`.
		*/
		std::map<DeviceId, std::queue<InputMessage>> mBatches;

		/**
		* Creates a MotionEvent by consuming samples from the provided queue. If one message has
		* eventTime > adjustedFrameTime, all subsequent messages in the queue will be skipped. It is
		* assumed that messages are queued in chronological order. In other words, only events that
		* occurred prior to the adjustedFrameTime will be consumed.
		* @param requestedFrameTime the time up to which to consume events.
		* @param messages the queue of messages to consume from
		* Creates a MotionEvent by consuming samples from the provided queue. Consumes all messages
		* with eventTime <= requestedFrameTime - resampleLatency, where `resampleLatency` is latency
		* introduced by the resampler. Assumes that messages are queued in chronological order.
		* @param requestedFrameTime The time up to which consume messages, as given by the inequality
		* above. If std::nullopt, everything in messages will be consumed.
		* @param messages the queue of messages to consume from.
		*/
		std::pair<std::unique_ptr<MotionEvent>, std::optional<uint32_t>> createBatchedMotionEvent(
		const nsecs_t requestedFrameTime, std::queue<InputMessage>& messages);
		const std::optional<nsecs_t> requestedFrameTime, std::queue<InputMessage>& messages);

		/**
		* Consumes the batched input events, optionally allowing the caller to specify a device id

+0 −4

Original line number	Diff line number	Diff line
		@@ -172,10 +172,6 @@ BackendUnifiedServiceManager::BackendUnifiedServiceManager(const sp<AidlServiceM
		mCacheForGetService = std::make_shared<BinderCacheWithInvalidation>();
		}

		sp<AidlServiceManager> BackendUnifiedServiceManager::getImpl() {
		return mTheRealServiceManager;
		}

		Status BackendUnifiedServiceManager::getService(const ::std::string& name,
		sp<IBinder>* _aidl_return) {
		os::Service service;

+0 −1

Original line number	Diff line number	Diff line
		@@ -121,7 +121,6 @@ class BackendUnifiedServiceManager : public android::os::BnServiceManager {
		public:
		explicit BackendUnifiedServiceManager(const sp<os::IServiceManager>& impl);

		sp<os::IServiceManager> getImpl();
		binder::Status getService(const ::std::string& name, sp<IBinder>* _aidl_return) override;
		binder::Status getService2(const ::std::string& name, os::Service* out) override;
		binder::Status checkService(const ::std::string& name, os::Service* out) override;

+6 −0

Original line number	Diff line number	Diff line
		@@ -139,6 +139,9 @@ rust_bindgen {
		"--raw-line",
		"use libc::sockaddr;",
		],
		cflags: [
		"-DANDROID_PLATFORM",
		],
		shared_libs: [
		"libbinder_ndk",
		],
		@@ -179,6 +182,9 @@ rust_bindgen {
		// rustified
		"libbinder_ndk_bindgen_flags.txt",
		],
		cflags: [
		"-DANDROID_PLATFORM",
		],
		shared_libs: [
		"libbinder_ndk_on_trusty_mock",
		"libc++",

0 → 100644

+15 −0

Original line number	Diff line number	Diff line
		[package]
		name = "android-binder"
		version = "0.1.0"
		edition = "2021"
		description = "Safe bindings to Android Binder, restricted to the NDK"
		license = "Apache-2.0"

		[dependencies]
		binder-ndk-sys = { package = "android-binder-ndk-sys", version = "0.1", path = "./sys" }
		downcast-rs = "1.2.1"
		libc = "0.2.159"

		[lints.rust.unexpected_cfgs]
		level = "warn"
		check-cfg = ["cfg(android_vendor)", "cfg(android_ndk)", "cfg(android_vndk)", "cfg(trusty)"]