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

Commit d0217ce4 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: Ic817a342646f372d32efdeae842197dd865c0035
parents 3e8b8460 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;