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

Commit f933d3c8 authored by Hongguang Chen's avatar Hongguang Chen Committed by Android (Google) Code Review
Browse files

Merge "Allow input device config files in product and system_ext." into sc-dev

parents cc8ce71a 1438ccbd
Loading
Loading
Loading
Loading
+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;