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

Commit ee88243e authored by Hongguang Chen's avatar Hongguang Chen Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I1e29cdebd944724040ccba7658ccf114005d6c78
parents e6f967ec f933d3c8

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;