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

Commit 3b0cf130 authored by Daniel Norman's avatar Daniel Norman Committed by Automerger Merge Worker
Browse files

Merge "Updates InputDevice.cpp to read input configs from an APEX." am:... 

Merge "Updates InputDevice.cpp to read input configs from an APEX." am: ad23373a am: 131d8dd6 am: 894ab921 am: 6786e58c am: e88cb403

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1836694

Change-Id: I146650b17311169a87332bd4fbdc03b78b4d97b5
parents d3db6154 e88cb403

libs/input/InputDevice.cpp

+9 −2
Original line number Diff line number Diff line
@@ -89,8 +89,15 @@ std::string getInputDeviceConfigurationFilePathByName( 


    // Treblized input device config files will be located /product/usr, /system_ext/usr,

    // /odm/usr or /vendor/usr.

    const char* rootsForPartition[]{"/product", "/system_ext", "/odm", "/vendor",

                                    getenv("ANDROID_ROOT")};

    // These files may also be in the com.android.input.config APEX.

    const char* rootsForPartition[]{

            "/product",

            "/system_ext",

            "/odm",

            "/vendor",

            "/apex/com.android.input.config/etc",

            getenv("ANDROID_ROOT"),

    };

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

        if (rootsForPartition[i] == nullptr) {

            continue;