Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55a23758 authored by Harry Cutts's avatar Harry Cutts
Browse files

uinput: use enum valueOf method 

This makes the Command and UinputControlCode enums and the code to look
up their values a little tidier.

Bug: 302297266
Test: atest CtsInputHostTestCases
Change-Id: Iad98088b93dc1e1b72df1efbeb9010f78c6962e9
parent 37e7df39

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

+17 −36
Original line number Diff line number Diff line
@@ -31,16 +31,10 @@ public class Event { 
    private static final String TAG = "UinputEvent";



    enum Command {

        REGISTER("register"),

        DELAY("delay"),

        INJECT("inject"),

        SYNC("sync");



        final String mCommandName;



        Command(String command) {

            mCommandName = command;

        }

        REGISTER,

        DELAY,

        INJECT,

        SYNC,

    }



    // Constants representing evdev event types, from include/uapi/linux/input-event-codes.h in the
@@ -55,29 +49,23 @@ public class Event { 
    public static final int EV_FF = 0x15;



    public enum UinputControlCode {

        UI_SET_EVBIT("UI_SET_EVBIT", 100),

        UI_SET_KEYBIT("UI_SET_KEYBIT", 101),

        UI_SET_RELBIT("UI_SET_RELBIT", 102),

        UI_SET_ABSBIT("UI_SET_ABSBIT", 103),

        UI_SET_MSCBIT("UI_SET_MSCBIT", 104),

        UI_SET_LEDBIT("UI_SET_LEDBIT", 105),

        UI_SET_SNDBIT("UI_SET_SNDBIT", 106),

        UI_SET_FFBIT("UI_SET_FFBIT", 107),

        UI_SET_SWBIT("UI_SET_SWBIT", 109),

        UI_SET_PROPBIT("UI_SET_PROPBIT", 110);



        private final String mName;

        UI_SET_EVBIT(100),

        UI_SET_KEYBIT(101),

        UI_SET_RELBIT(102),

        UI_SET_ABSBIT(103),

        UI_SET_MSCBIT(104),

        UI_SET_LEDBIT(105),

        UI_SET_SNDBIT(106),

        UI_SET_FFBIT(107),

        UI_SET_SWBIT(109),

        UI_SET_PROPBIT(110);



        private final int mValue;



        UinputControlCode(String name, int value) {

            this.mName = name;

        UinputControlCode(int value) {

            this.mValue = value;

        }



        public String getName() {

            return mName;

        }



        public int getValue() {

            return mValue;

        }
@@ -193,14 +181,7 @@ public class Event { 
        }



        public void setCommand(String 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);

            mEvent.mCommand = Command.valueOf(command.toUpperCase());

        }



        public void setName(String name) {

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

+4 −5
Original line number Diff line number Diff line
@@ -189,12 +189,11 @@ public class JsonStyleParser { 


    private Event.UinputControlCode readUinputControlCode() throws IOException {

        var code = readValueAsInt((controlTypeStr) -> {

            for (Event.UinputControlCode controlCode : Event.UinputControlCode.values()) {

                if (controlCode.getName().equals(controlTypeStr)) {

                    return controlCode.getValue();

                }

            }

            try {

                return Event.UinputControlCode.valueOf(controlTypeStr).getValue();

            } catch (IllegalArgumentException ex) {

                return -1;

            }

        });

        for (Event.UinputControlCode controlCode : Event.UinputControlCode.values()) {

            if (controlCode.getValue() == code) {