Merge changes Idd3b6166,Iad0e7888 into main (69f1c8e5) · Commits · e / os / android_frameworks_base

cmds/uinput/jni/com_android_commands_uinput_Device.cpp

+12 −11

Original line number	Diff line number	Diff line
		@@ -96,9 +96,9 @@ JNIEnv* DeviceCallback::getJNIEnv() {
		return env;
		}

		std::unique_ptr<UinputDevice> UinputDevice::open(int32_t id, const char* name, int32_t vid,
		int32_t pid, uint16_t bus, uint32_t ffEffectsMax,
		const char* port,
		std::unique_ptr<UinputDevice> UinputDevice::open(int32_t id, const char* name, int32_t vendorId,
		int32_t productId, int32_t versionId, uint16_t bus,
		uint32_t ffEffectsMax, const char* port,
		std::unique_ptr<DeviceCallback> callback) {
		android::base::unique_fd fd(::open(UINPUT_PATH, O_RDWR \| O_NONBLOCK \| O_CLOEXEC));
		if (!fd.ok()) {
		@@ -118,8 +118,9 @@ std::unique_ptr<UinputDevice> UinputDevice::open(int32_t id, const char* name, i
		strlcpy(setupDescriptor.name, name, UINPUT_MAX_NAME_SIZE);
		setupDescriptor.id.version = 1;
		setupDescriptor.id.bustype = bus;
		setupDescriptor.id.vendor = vid;
		setupDescriptor.id.product = pid;
		setupDescriptor.id.vendor = vendorId;
		setupDescriptor.id.product = productId;
		setupDescriptor.id.version = versionId;
		setupDescriptor.ff_effects_max = ffEffectsMax;

		// Request device configuration.
		@@ -242,9 +243,9 @@ std::vector<int32_t> toVector(JNIEnv* env, jintArray javaArray) {
		return data;
		}

		static jlong openUinputDevice(JNIEnv* env, jclass /* clazz */, jstring rawName, jint id, jint vid,
		jint pid, jint bus, jint ffEffectsMax, jstring rawPort,
		jobject callback) {
		static jlong openUinputDevice(JNIEnv* env, jclass /* clazz */, jstring rawName, jint id,
		jint vendorId, jint productId, jint versionId, jint bus,
		jint ffEffectsMax, jstring rawPort, jobject callback) {
		ScopedUtfChars name(env, rawName);
		if (name.c_str() == nullptr) {
		return 0;
		@@ -255,8 +256,8 @@ static jlong openUinputDevice(JNIEnv* env, jclass /* clazz */, jstring rawName,
		std::make_unique<uinput::DeviceCallback>(env, callback);

		std::unique_ptr<uinput::UinputDevice> d =
		uinput::UinputDevice::open(id, name.c_str(), vid, pid, bus, ffEffectsMax, port.c_str(),
		std::move(cb));
		uinput::UinputDevice::open(id, name.c_str(), vendorId, productId, versionId, bus,
		ffEffectsMax, port.c_str(), std::move(cb));
		return reinterpret_cast<jlong>(d.release());
		}

		@@ -326,7 +327,7 @@ static jint getEvdevInputPropByLabel(JNIEnv* env, jclass /* clazz */, jstring ra

		static JNINativeMethod sMethods[] = {
		{"nativeOpenUinputDevice",
		"(Ljava/lang/String;IIIIILjava/lang/String;"
		"(Ljava/lang/String;IIIIIILjava/lang/String;"
		"Lcom/android/commands/uinput/Device$DeviceCallback;)J",
		reinterpret_cast<void*>(openUinputDevice)},
		{"nativeInjectEvent", "(JIII)V", reinterpret_cast<void*>(injectEvent)},

cmds/uinput/jni/com_android_commands_uinput_Device.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -46,9 +46,9 @@ private:

		class UinputDevice {
		public:
		static std::unique_ptr<UinputDevice> open(int32_t id, const char* name, int32_t vid,
		int32_t pid, uint16_t bus, uint32_t ff_effects_max,
		const char* port,
		static std::unique_ptr<UinputDevice> open(int32_t id, const char* name, int32_t vendorId,
		int32_t productId, int32_t versionId, uint16_t bus,
		uint32_t ff_effects_max, const char* port,
		std::unique_ptr<DeviceCallback> callback);

		virtual ~UinputDevice();

cmds/uinput/src/com/android/commands/uinput/Device.java

+15 −11

Original line number	Diff line number	Diff line
		@@ -61,8 +61,9 @@ public class Device {
		System.loadLibrary("uinputcommand_jni");
		}

		private static native long nativeOpenUinputDevice(String name, int id, int vid, int pid,
		int bus, int ffEffectsMax, String port, DeviceCallback callback);
		private static native long nativeOpenUinputDevice(String name, int id, int vendorId,
		int productId, int versionId, int bus, int ffEffectsMax, String port,
		DeviceCallback callback);
		private static native void nativeCloseUinputDevice(long ptr);
		private static native void nativeInjectEvent(long ptr, int type, int code, int value);
		private static native void nativeConfigure(int handle, int code, int[] configs);
		@@ -71,7 +72,7 @@ public class Device {
		private static native int nativeGetEvdevEventCodeByLabel(int type, String label);
		private static native int nativeGetEvdevInputPropByLabel(String label);

		public Device(int id, String name, int vid, int pid, int bus,
		public Device(int id, String name, int vendorId, int productId, int versionId, int bus,
		SparseArray<int[]> configuration, int ffEffectsMax,
		SparseArray<InputAbsInfo> absInfo, String port) {
		mId = id;
		@@ -83,19 +84,20 @@ public class Device {
		mOutputStream = System.out;
		SomeArgs args = SomeArgs.obtain();
		args.argi1 = id;
		args.argi2 = vid;
		args.argi3 = pid;
		args.argi4 = bus;
		args.argi5 = ffEffectsMax;
		args.argi2 = vendorId;
		args.argi3 = productId;
		args.argi4 = versionId;
		args.argi5 = bus;
		args.argi6 = ffEffectsMax;
		if (name != null) {
		args.arg1 = name;
		} else {
		args.arg1 = id + ":" + vid + ":" + pid;
		args.arg1 = id + ":" + vendorId + ":" + productId;
		}
		if (port != null) {
		args.arg2 = port;
		} else {
		args.arg2 = "uinput:" + id + ":" + vid + ":" + pid;
		args.arg2 = "uinput:" + id + ":" + vendorId + ":" + productId;
		}

		mHandler.obtainMessage(MSG_OPEN_UINPUT_DEVICE, args).sendToTarget();
		@@ -161,8 +163,10 @@ public class Device {
		case MSG_OPEN_UINPUT_DEVICE:
		SomeArgs args = (SomeArgs) msg.obj;
		String name = (String) args.arg1;
		mPtr = nativeOpenUinputDevice(name, args.argi1, args.argi2,
		args.argi3, args.argi4, args.argi5, (String) args.arg2,
		mPtr = nativeOpenUinputDevice(name, args.argi1 /* id */,
		args.argi2 /* vendorId /, args.argi3 / productId */,
		args.argi4 /* versionId /, args.argi5 / bus */,
		args.argi6 /* ffEffectsMax /, (String) args.arg2 / port */,
		new DeviceCallback());
		if (mPtr == 0) {
		RuntimeException ex = new RuntimeException(

cmds/uinput/src/com/android/commands/uinput/EvemuParser.java

+116 −56

Original line number	Diff line number	Diff line
		@@ -19,8 +19,8 @@ package com.android.commands.uinput;
		import android.annotation.Nullable;
		import android.util.SparseArray;

		import java.io.BufferedReader;
		import java.io.IOException;
		import java.io.LineNumberReader;
		import java.io.Reader;
		import java.util.ArrayDeque;
		import java.util.ArrayList;
		@@ -47,10 +47,11 @@ public class EvemuParser implements EventParser {
		private static final int REGISTRATION_DELAY_MILLIS = 500;

		private static class CommentAwareReader {
		private final BufferedReader mReader;
		private final LineNumberReader mReader;
		private String mPreviousLine;
		private String mNextLine;

		CommentAwareReader(BufferedReader in) throws IOException {
		CommentAwareReader(LineNumberReader in) throws IOException {
		mReader = in;
		mNextLine = findNextLine();
		}
		@@ -90,12 +91,46 @@ public class EvemuParser implements EventParser {

		/** Moves to the next line of the file. */
		public void advance() throws IOException {
		mPreviousLine = mNextLine;
		mNextLine = findNextLine();
		}

		public boolean isAtEndOfFile() {
		return mNextLine == null;
		}

		/** Returns the previous line, for error messages. */
		public String getPreviousLine() {
		return mPreviousLine;
		}

		/** Returns the number of the <b>previous</b> line. */
		public int getPreviousLineNumber() {
		return mReader.getLineNumber() - 1;
		}
		}

		public static class ParsingException extends RuntimeException {
		private final int mLineNumber;
		private final String mLine;

		ParsingException(String message, CommentAwareReader reader) {
		this(message, reader.getPreviousLine(), reader.getPreviousLineNumber());
		}

		ParsingException(String message, String line, int lineNumber) {
		super(message);
		mLineNumber = lineNumber;
		mLine = line;
		}

		/** Returns a nicely formatted error message, including the line number and line. */
		public String makeErrorMessage() {
		return String.format("""
		Parsing error on line %d: %s
		--> %s
		""", mLineNumber, getMessage(), mLine);
		}
		}

		private final CommentAwareReader mReader;
		@@ -107,7 +142,7 @@ public class EvemuParser implements EventParser {
		private final Queue<Event> mQueuedEvents = new ArrayDeque<>(2);

		public EvemuParser(Reader in) throws IOException {
		mReader = new CommentAwareReader(new BufferedReader(in));
		mReader = new CommentAwareReader(new LineNumberReader(in));
		mQueuedEvents.add(parseRegistrationEvent());

		// The kernel takes a little time to set up an evdev device after the initial
		@@ -133,20 +168,22 @@ public class EvemuParser implements EventParser {
		return null;
		}

		final String[] parts = expectLineWithParts("E", 4);
		final String line = expectLine("E");
		final String[] parts = expectParts(line, 4);
		final String[] timeParts = parts[0].split("\\.");
		if (timeParts.length != 2) {
		throw new RuntimeException("Invalid timestamp (does not contain a '.')");
		throw new ParsingException(
		"Invalid timestamp '" + parts[0] + "' (should contain a single '.')", mReader);
		}
		// TODO(b/310958309): use timeMicros to set the timestamp on the event being sent.
		final long timeMicros =
		Long.parseLong(timeParts[0]) * 1_000_000 + Integer.parseInt(timeParts[1]);
		parseLong(timeParts[0], 10) * 1_000_000 + parseInt(timeParts[1], 10);
		final Event.Builder eb = new Event.Builder();
		eb.setId(DEVICE_ID);
		eb.setCommand(Event.Command.INJECT);
		final int eventType = Integer.parseInt(parts[1], 16);
		final int eventCode = Integer.parseInt(parts[2], 16);
		final int value = Integer.parseInt(parts[3]);
		final int eventType = parseInt(parts[1], 16);
		final int eventCode = parseInt(parts[2], 16);
		final int value = parseInt(parts[3], 10);
		eb.setInjections(new int[] {eventType, eventCode, value});

		if (mLastEventTimeMicros == -1) {
		@@ -184,11 +221,12 @@ public class EvemuParser implements EventParser {
		eb.setCommand(Event.Command.REGISTER);
		eb.setName(expectLine("N"));

		final String[] idStrings = expectLineWithParts("I", 4);
		eb.setBusId(Integer.parseInt(idStrings[0], 16));
		eb.setVid(Integer.parseInt(idStrings[1], 16));
		eb.setPid(Integer.parseInt(idStrings[2], 16));
		// TODO(b/302297266): support setting the version ID, and set it to idStrings[3].
		final String idsLine = expectLine("I");
		final String[] idStrings = expectParts(idsLine, 4);
		eb.setBusId(parseInt(idStrings[0], 16));
		eb.setVendorId(parseInt(idStrings[1], 16));
		eb.setProductId(parseInt(idStrings[2], 16));
		eb.setVersionId(parseInt(idStrings[3], 16));

		final SparseArray<int[]> config = new SparseArray<>();
		config.append(Event.UinputControlCode.UI_SET_PROPBIT.getValue(), parseProperties());
		@@ -215,33 +253,39 @@ public class EvemuParser implements EventParser {
		}

		private int[] parseProperties() throws IOException {
		final List<String> propBitmapParts = new ArrayList<>();
		final ArrayList<Integer> propBitmapParts = new ArrayList<>();
		String line = acceptLine("P");
		while (line != null) {
		propBitmapParts.addAll(List.of(line.strip().split(" ")));
		String[] parts = line.strip().split(" ");
		propBitmapParts.ensureCapacity(propBitmapParts.size() + parts.length);
		for (String part : parts) {
		propBitmapParts.add(parseBitmapPart(part, line));
		}
		line = acceptLine("P");
		}
		return hexStringBitmapToEventCodes(propBitmapParts);
		return bitmapToEventCodes(propBitmapParts);
		}

		private void parseAxisBitmaps(SparseArray<int[]> config) throws IOException {
		final Map<Integer, List<String>> axisBitmapParts = new HashMap<>();
		final Map<Integer, ArrayList<Integer>> axisBitmapParts = new HashMap<>();
		String line = acceptLine("B");
		while (line != null) {
		final String[] parts = line.strip().split(" ");
		if (parts.length < 2) {
		throw new RuntimeException(
		throw new ParsingException(
		"Expected event type and at least one bitmap byte on 'B:' line; only found "
		+ parts.length + " elements");
		+ parts.length + " elements", mReader);
		}
		final int eventType = Integer.parseInt(parts[0], 16);
		final int eventType = parseInt(parts[0], 16);
		// EV_SYN cannot be configured through uinput, so skip it.
		if (eventType != Event.EV_SYN) {
		if (!axisBitmapParts.containsKey(eventType)) {
		axisBitmapParts.put(eventType, new ArrayList<>());
		}
		ArrayList<Integer> bitmapParts = axisBitmapParts.get(eventType);
		bitmapParts.ensureCapacity(bitmapParts.size() + parts.length);
		for (int i = 1; i < parts.length; i++) {
		axisBitmapParts.get(eventType).add(parts[i]);
		axisBitmapParts.get(eventType).add(parseBitmapPart(parts[i], line));
		}
		}
		line = acceptLine("B");
		@@ -253,7 +297,7 @@ public class EvemuParser implements EventParser {
		}
		final Event.UinputControlCode controlCode =
		Event.UinputControlCode.forEventType(entry.getKey());
		final int[] eventCodes = hexStringBitmapToEventCodes(entry.getValue());
		final int[] eventCodes = bitmapToEventCodes(entry.getValue());
		if (controlCode != null && eventCodes.length > 0) {
		config.append(controlCode.getValue(), eventCodes);
		eventTypesToSet.add(entry.getKey());
		@@ -263,24 +307,33 @@ public class EvemuParser implements EventParser {
		Event.UinputControlCode.UI_SET_EVBIT.getValue(), unboxIntList(eventTypesToSet));
		}

		private int parseBitmapPart(String part, String line) {
		int b = parseInt(part, 16);
		if (b < 0x0 \|\| b > 0xff) {
		throw new ParsingException("Bitmap part '" + part
		+ "' invalid; parts must be hexadecimal values between 00 and ff.", mReader);
		}
		return b;
		}

		private SparseArray<InputAbsInfo> parseAbsInfos() throws IOException {
		final SparseArray<InputAbsInfo> absInfos = new SparseArray<>();
		String line = acceptLine("A");
		while (line != null) {
		final String[] parts = line.strip().split(" ");
		if (parts.length < 5 \|\| parts.length > 6) {
		throw new RuntimeException(
		"'A:' lines should have the format 'A: <index (hex)> <min> <max> <fuzz> "
		throw new ParsingException(
		"AbsInfo lines should have the format 'A: <index (hex)> <min> <max> <fuzz> "
		+ "<flat> [<resolution>]'; expected 5 or 6 numbers but found "
		+ parts.length);
		+ parts.length, mReader);
		}
		final int axisCode = Integer.parseInt(parts[0], 16);
		final int axisCode = parseInt(parts[0], 16);
		final InputAbsInfo info = new InputAbsInfo();
		info.minimum = Integer.parseInt(parts[1]);
		info.maximum = Integer.parseInt(parts[2]);
		info.fuzz = Integer.parseInt(parts[3]);
		info.flat = Integer.parseInt(parts[4]);
		info.resolution = parts.length > 5 ? Integer.parseInt(parts[5]) : 0;
		info.minimum = parseInt(parts[1], 10);
		info.maximum = parseInt(parts[2], 10);
		info.fuzz = parseInt(parts[3], 10);
		info.flat = parseInt(parts[4], 10);
		info.resolution = parts.length > 5 ? parseInt(parts[5], 10) : 0;
		absInfos.append(axisCode, info);
		line = acceptLine("A");
		}
		@@ -305,7 +358,9 @@ public class EvemuParser implements EventParser {
		private String expectLine(String type) throws IOException {
		final String line = acceptLine(type);
		if (line == null) {
		throw new RuntimeException("Expected line of type '" + type + "'");
		throw new ParsingException("Expected line of type '" + type + "'. (Lines should be in "
		+ "the order N, I, P, B, A, L, S, E.)",
		mReader.peekLine(), mReader.getPreviousLineNumber() + 1);
		} else {
		return line;
		}
		@@ -325,9 +380,8 @@ public class EvemuParser implements EventParser {
		}
		final String[] lineParts = line.split(": ", 2);
		if (lineParts.length < 2) {
		// TODO(b/302297266): make a proper exception class for syntax errors, including line
		// numbers, etc.. (We can use LineNumberReader to track them.)
		throw new RuntimeException("Line without ': '");
		throw new ParsingException("Missing type separator ': '",
		line, mReader.getPreviousLineNumber() + 1);
		}
		if (lineParts[0].equals(type)) {
		mReader.advance();
		@@ -337,31 +391,37 @@ public class EvemuParser implements EventParser {
		}
		}

		/**
		* Like {@link #expectLine(String)}, but also checks that the contents of the line is formed of
		* {@code numParts} space-separated parts.
		*
		* @param type the type of the line to expect, represented by the letter before the ':'.
		* @param numParts the number of parts to expect.
		* @return the part of the line after the ": ", split into {@code numParts} sections.
		*/
		private String[] expectLineWithParts(String type, int numParts) throws IOException {
		final String[] parts = expectLine(type).strip().split(" ");
		private String[] expectParts(String line, int numParts) {
		final String[] parts = line.strip().split(" ");
		if (parts.length != numParts) {
		throw new RuntimeException("Expected a '" + type + "' line with " + numParts
		+ " parts, found one with " + parts.length);
		throw new ParsingException(
		"Expected a line with " + numParts + " space-separated parts, but found one "
		+ "with " + parts.length, mReader);
		}
		return parts;
		}

		private static int[] hexStringBitmapToEventCodes(List<String> strs) {
		final List<Integer> codes = new ArrayList<>();
		for (int iByte = 0; iByte < strs.size(); iByte++) {
		int b = Integer.parseInt(strs.get(iByte), 16);
		if (b < 0x0 \|\| b > 0xff) {
		throw new RuntimeException("Bitmap part '" + strs.get(iByte)
		+ "' invalid; parts must be between 00 and ff.");
		private int parseInt(String s, int radix) {
		try {
		return Integer.parseInt(s, radix);
		} catch (NumberFormatException ex) {
		throw new ParsingException(
		"'" + s + "' is not a valid integer of base " + radix, mReader);
		}
		}

		private long parseLong(String s, int radix) {
		try {
		return Long.parseLong(s, radix);
		} catch (NumberFormatException ex) {
		throw new ParsingException("'" + s + "' is not a valid long of base " + radix, mReader);
		}
		}

		private static int[] bitmapToEventCodes(List<Integer> bytes) {
		final List<Integer> codes = new ArrayList<>();
		for (int iByte = 0; iByte < bytes.size(); iByte++) {
		int b = bytes.get(iByte);
		for (int iBit = 0; iBit < 8; iBit++) {
		if ((b & 1) != 0) {
		codes.add(iByte * 8 + iBit);

cmds/uinput/src/com/android/commands/uinput/Event.java

+19 −10

Original line number	Diff line number	Diff line
		@@ -94,8 +94,9 @@ public class Event {
		private int mId;
		private Command mCommand;
		private String mName;
		private int mVid;
		private int mPid;
		private int mVendorId;
		private int mProductId;
		private int mVersionId;
		private int mBusId;
		private int[] mInjections;
		private SparseArray<int[]> mConfiguration;
		@@ -118,11 +119,15 @@ public class Event {
		}

		public int getVendorId() {
		return mVid;
		return mVendorId;
		}

		public int getProductId() {
		return mPid;
		return mProductId;
		}

		public int getVersionId() {
		return mVersionId;
		}

		public int getBus() {
		@@ -172,8 +177,8 @@ public class Event {
		return "Event{id=" + mId
		+ ", command=" + mCommand
		+ ", name=" + mName
		+ ", vid=" + mVid
		+ ", pid=" + mPid
		+ ", vid=" + mVendorId
		+ ", pid=" + mProductId
		+ ", busId=" + mBusId
		+ ", events=" + Arrays.toString(mInjections)
		+ ", configuration=" + mConfiguration
		@@ -216,12 +221,16 @@ public class Event {
		mEvent.mConfiguration = configuration;
		}

		public void setVid(int vid) {
		mEvent.mVid = vid;
		public void setVendorId(int vendorId) {
		mEvent.mVendorId = vendorId;
		}

		public void setProductId(int productId) {
		mEvent.mProductId = productId;
		}

		public void setPid(int pid) {
		mEvent.mPid = pid;
		public void setVersionId(int versionId) {
		mEvent.mVersionId = versionId;
		}

		public void setBusId(int busId) {