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

Commit 6e245a3e authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "Do not use hard-coded apex name" into main am: c2e69665 am: 05d40cd7 

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



Change-Id: Id5125ec34cdd7e0cdbb203a848f9e8dbb12afb7b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9180f87b 05d40cd7

libs/input/InputDevice.cpp

+17 −14
Original line number Diff line number Diff line
@@ -20,12 +20,14 @@ 
#include <unistd.h>

#include <ctype.h>



#include <android-base/properties.h>

#include <android-base/stringprintf.h>

#include <ftl/enum.h>

#include <gui/constants.h>

#include <input/InputDevice.h>

#include <input/InputEventLabels.h>



using android::base::GetProperty;

using android::base::StringPrintf;



namespace android {
@@ -96,21 +98,22 @@ std::string getInputDeviceConfigurationFilePathByName( 


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

    // /odm/usr or /vendor/usr.

    // 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"),

    std::vector<std::string> pathPrefixes{

            "/product/usr/",

            "/system_ext/usr/",

            "/odm/usr/",

            "/vendor/usr/",

    };

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

        if (rootsForPartition[i] == nullptr) {

            continue;

    // These files may also be in the APEX pointed by input_device.config_file.apex sysprop.

    if (auto apex = GetProperty("input_device.config_file.apex", ""); !apex.empty()) {

        pathPrefixes.push_back("/apex/" + apex + "/etc/usr/");

    }

        path = rootsForPartition[i];

        path += "/usr/";

    // ANDROID_ROOT may not be set on host

    if (auto android_root = getenv("ANDROID_ROOT"); android_root != nullptr) {

        pathPrefixes.push_back(std::string(android_root) + "/usr/");

    }

    for (const auto& prefix : pathPrefixes) {

        path = prefix;

        appendInputDeviceConfigurationFileRelativePath(path, name, type);

#if DEBUG_PROBE

        ALOGD("Probing for system provided input device configuration file: path='%s'",