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

Commit 9e94788e authored by Frank Barchard's avatar Frank Barchard
Browse files

InputDevice warning fixes and make warnigs into Error 

use const char * for string literals in InputDevice
Remove unused variable in Keyboard

Bug: 35993509
Test: mm in frameworks/native/libs/input builds without the warning
Change-Id: I11242835eae855386c47e56d6c36e5a2f912a28f
parent d07fc91a

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);