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

Commit ad23373a authored by Daniel Norman's avatar Daniel Norman Committed by Gerrit Code Review
Browse files

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

parents 254d9b3f 54283d65
Loading
Loading
Loading
Loading
+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;