Uinput: Use enums for commands
Bug: 294275314
Test: manual, presubmit
Change-Id: I928da2ad53afa91bc9fe7b0dc9cddeb3c918c6a2
diff --git a/cmds/uinput/src/com/android/commands/uinput/Event.java b/cmds/uinput/src/com/android/commands/uinput/Event.java
index cddb407..e70fad8 100644
--- a/cmds/uinput/src/com/android/commands/uinput/Event.java
+++ b/cmds/uinput/src/com/android/commands/uinput/Event.java
@@ -39,9 +39,18 @@
public class Event {
private static final String TAG = "UinputEvent";
- public static final String COMMAND_REGISTER = "register";
- public static final String COMMAND_DELAY = "delay";
- public static final String COMMAND_INJECT = "inject";
+ enum Command {
+ REGISTER("register"),
+ DELAY("delay"),
+ INJECT("inject");
+
+ final String mCommandName;
+
+ Command(String command) {
+ mCommandName = command;
+ }
+ }
+
private static final int EV_KEY = 0x01;
private static final int EV_REL = 0x02;
private static final int EV_ABS = 0x03;
@@ -87,7 +96,7 @@
}
private int mId;
- private String mCommand;
+ private Command mCommand;
private String mName;
private int mVid;
private int mPid;
@@ -103,7 +112,7 @@
return mId;
}
- public String getCommand() {
+ public Command getCommand() {
return mCommand;
}
@@ -177,7 +186,14 @@
}
private void setCommand(String command) {
- mEvent.mCommand = command;
+ Objects.requireNonNull(command, "Command must not be null");
+ for (Command cmd : Command.values()) {
+ if (cmd.mCommandName.equals(command)) {
+ mEvent.mCommand = cmd;
+ return;
+ }
+ }
+ throw new IllegalStateException("Unrecognized command: " + command);
}
public void setName(String name) {
@@ -226,21 +242,23 @@
} else if (mEvent.mCommand == null) {
throw new IllegalStateException("Event does not contain a command");
}
- if (COMMAND_REGISTER.equals(mEvent.mCommand)) {
- if (mEvent.mConfiguration == null) {
- throw new IllegalStateException(
- "Device registration is missing configuration");
+ switch (mEvent.mCommand) {
+ case REGISTER -> {
+ if (mEvent.mConfiguration == null) {
+ throw new IllegalStateException(
+ "Device registration is missing configuration");
+ }
}
- } else if (COMMAND_DELAY.equals(mEvent.mCommand)) {
- if (mEvent.mDuration <= 0) {
- throw new IllegalStateException("Delay has missing or invalid duration");
+ case DELAY -> {
+ if (mEvent.mDuration <= 0) {
+ throw new IllegalStateException("Delay has missing or invalid duration");
+ }
}
- } else if (COMMAND_INJECT.equals(mEvent.mCommand)) {
- if (mEvent.mInjections == null) {
- throw new IllegalStateException("Inject command is missing injection data");
+ case INJECT -> {
+ if (mEvent.mInjections == null) {
+ throw new IllegalStateException("Inject command is missing injection data");
+ }
}
- } else {
- throw new IllegalStateException("Unknown command " + mEvent.mCommand);
}
return mEvent;
}
diff --git a/cmds/uinput/src/com/android/commands/uinput/Uinput.java b/cmds/uinput/src/com/android/commands/uinput/Uinput.java
index 740578e..16755c2 100644
--- a/cmds/uinput/src/com/android/commands/uinput/Uinput.java
+++ b/cmds/uinput/src/com/android/commands/uinput/Uinput.java
@@ -25,6 +25,7 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
+import java.util.Objects;
/**
* Uinput class encapsulates execution of "uinput" command. It parses the provided input stream
@@ -96,28 +97,26 @@
private void process(Event e) {
final int index = mDevices.indexOfKey(e.getId());
- if (index >= 0) {
- Device d = mDevices.valueAt(index);
- if (Event.COMMAND_DELAY.equals(e.getCommand())) {
- d.addDelay(e.getDuration());
- } else if (Event.COMMAND_INJECT.equals(e.getCommand())) {
- d.injectEvent(e.getInjections());
- } else {
- if (Event.COMMAND_REGISTER.equals(e.getCommand())) {
- error("Device id=" + e.getId() + " is already registered. Ignoring event.");
- } else {
- error("Unknown command \"" + e.getCommand() + "\". Ignoring event.");
- }
+ if (index < 0) {
+ if (e.getCommand() != Event.Command.REGISTER) {
+ Log.e(TAG, "Unknown device id specified. Ignoring event.");
+ return;
}
- } else if (Event.COMMAND_REGISTER.equals(e.getCommand())) {
registerDevice(e);
- } else {
- Log.e(TAG, "Unknown device id specified. Ignoring event.");
+ return;
+ }
+
+ final Device d = mDevices.valueAt(index);
+ switch (Objects.requireNonNull(e.getCommand())) {
+ case REGISTER ->
+ error("Device id=" + e.getId() + " is already registered. Ignoring event.");
+ case INJECT -> d.injectEvent(e.getInjections());
+ case DELAY -> d.addDelay(e.getDuration());
}
}
private void registerDevice(Event e) {
- if (!Event.COMMAND_REGISTER.equals(e.getCommand())) {
+ if (!Event.Command.REGISTER.equals(e.getCommand())) {
throw new IllegalStateException(
"Tried to send command \"" + e.getCommand() + "\" to an unregistered device!");
}
