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

Commit 54283d65 authored by Daniel Norman's avatar Daniel Norman
Browse files

Updates InputDevice.cpp to read input configs from an APEX. 

Devices that include these files in an APEX must ensure it is named
as expected by this file: com.android.input.config.

Bug: 197881714
Test: Tested with an input config apex for cuttlefish
Change-Id: Iccccc9bb57e25013aadec6aa0de8e58cbd5c9e68
parent cfd04603

libs/input/InputDevice.cpp

+9 −2
Original line number Original line 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,

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

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

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

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

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

                                    getenv("ANDROID_ROOT")};

    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++) {

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

        if (rootsForPartition[i] == nullptr) {

        if (rootsForPartition[i] == nullptr) {

            continue;

            continue;