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

Commit 1438ccbd authored by Hongguang Chen's avatar Hongguang Chen
Browse files

Allow input device config files in product and system_ext. 

Treblization requires to locate OEM-specific configs in its own
partition. So the input device config file could be located in
/product/usr or /system_ext/usr.

Bug: 186864233
Test: "dumpsys input" and manual testing.
Change-Id: I72ca5c786ba1848edcef5c6f3ae71ce27bf8bdae
parent a0e37d28

libs/input/InputDevice.cpp

+4 −2
Original line number Diff line number Diff line
@@ -87,8 +87,10 @@ std::string getInputDeviceConfigurationFilePathByName( 
    // Search system repository.

    std::string path;



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

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

    // 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")};

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

        if (rootsForPartition[i] == nullptr) {

            continue;