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

Commit 848cbb0c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "InputDevice warning fixes and make warnigs into Error"

parents f0c53d6e 9e94788e

libs/input/Android.bp

+5 −1
Original line number Diff line number Diff line
@@ -17,7 +17,11 @@ 
cc_library {

    name: "libinput",

    host_supported: true,



    cflags: [

        "-Wall",

        "-Wextra",

        "-Werror",

    ],

    srcs: [

        "Input.cpp",

        "InputDevice.cpp",

libs/input/InputDevice.cpp

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ String8 getInputDeviceConfigurationFilePathByName( 
    String8 path;



    // Treblized input device config files will be located /odm/usr or /vendor/usr.

    char *rootsForPartition[] {"/odm", "/vendor", getenv("ANDROID_ROOT")};

    const char *rootsForPartition[] {"/odm", "/vendor", getenv("ANDROID_ROOT")};

    for (size_t i = 0; i < size(rootsForPartition); i++) {

        path.setTo(rootsForPartition[i]);

        path.append("/usr/");

libs/input/Keyboard.cpp

+0 −1
Original line number Diff line number Diff line
@@ -208,7 +208,6 @@ static int32_t toggleLockedMetaState(int32_t mask, bool down, int32_t oldMetaSta 
}



int32_t updateMetaState(int32_t keyCode, bool down, int32_t oldMetaState) {

    int32_t mask;

    switch (keyCode) {

    case AKEYCODE_ALT_LEFT:

        return setEphemeralMetaState(AMETA_ALT_LEFT_ON, down, oldMetaState);