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

Commit d2adf6bc 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... 

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

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

Change-Id: Ibb8529c1d23dea77f8a779c1c3b0212534ff0a48
parents f287bb0c a6182907

libs/input/InputDevice.cpp

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

    // Search system repository.

    std::string path;

    std::string path;





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

    // Treblized input device config files will be located /product/usr, /system_ext/usr,

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

    // /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++) {

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

        if (rootsForPartition[i] == nullptr) {

        if (rootsForPartition[i] == nullptr) {

            continue;

            continue;