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

Commit 8f2ed017 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not load keylayout if required kernel module is missing" am: 332a29a5 

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



Change-Id: Iaf726114593d65e9402a1e34b503437d1f0c16e4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7ec56b3e 332a29a5

include/input/InputDevice.h

+4 −2
Original line number Diff line number Diff line
@@ -295,6 +295,8 @@ enum class InputDeviceConfigurationFileType : int32_t { 
/*

 * Gets the path of an input device configuration file, if one is available.

 * Considers both system provided and user installed configuration files.

 * The optional suffix is appended to the end of the file name (before the

 * extension).

 *

 * The device identifier is used to construct several default configuration file

 * names to try based on the device name, vendor, product, and version.
@@ -302,8 +304,8 @@ enum class InputDeviceConfigurationFileType : int32_t { 
 * Returns an empty string if not found.

 */

extern std::string getInputDeviceConfigurationFilePathByDeviceIdentifier(

        const InputDeviceIdentifier& deviceIdentifier,

        InputDeviceConfigurationFileType type);

        const InputDeviceIdentifier& deviceIdentifier, InputDeviceConfigurationFileType type,

        const char* suffix = "");



/*

 * Gets the path of an input device configuration file, if one is available.

include/input/KeyLayoutMap.h

+5 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <stdint.h>

#include <utils/Errors.h>

#include <utils/Tokenizer.h>

#include <set>



#include <input/InputDevice.h>
@@ -63,7 +64,8 @@ struct AxisInfo { 
 */

class KeyLayoutMap {

public:

    static base::Result<std::shared_ptr<KeyLayoutMap>> load(const std::string& filename);

    static base::Result<std::shared_ptr<KeyLayoutMap>> load(const std::string& filename,

                                                            const char* contents = nullptr);

    static base::Result<std::shared_ptr<KeyLayoutMap>> loadContents(const std::string& filename,

                                                                    const char* contents);
@@ -103,6 +105,7 @@ private: 
    std::unordered_map<int32_t, Led> mLedsByScanCode;

    std::unordered_map<int32_t, Led> mLedsByUsageCode;

    std::unordered_map<int32_t, Sensor> mSensorsByAbsCode;

    std::set<std::string> mRequiredKernelConfigs;

    std::string mLoadFileName;



    KeyLayoutMap();
@@ -123,6 +126,7 @@ private: 
        status_t parseAxis();

        status_t parseLed();

        status_t parseSensor();

        status_t parseRequiredKernelConfig();

    };

};

include/input/Keyboard.h

+1 −3
Original line number Diff line number Diff line
@@ -62,8 +62,6 @@ private: 
    status_t loadKeyLayout(const InputDeviceIdentifier& deviceIdentifier, const std::string& name);

    status_t loadKeyCharacterMap(const InputDeviceIdentifier& deviceIdentifier,

                                 const std::string& name);

    std::string getPath(const InputDeviceIdentifier& deviceIdentifier,

            const std::string& name, InputDeviceConfigurationFileType type);

};



/**

libs/input/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ cc_library { 
        "libbase",

        "liblog",

        "libcutils",

        "libvintf",

    ],



    static_libs: [

libs/input/InputDevice.cpp

+18 −12
Original line number Diff line number Diff line
@@ -53,15 +53,18 @@ static void appendInputDeviceConfigurationFileRelativePath(std::string& path, 
}



std::string getInputDeviceConfigurationFilePathByDeviceIdentifier(

        const InputDeviceIdentifier& deviceIdentifier,

        InputDeviceConfigurationFileType type) {

        const InputDeviceIdentifier& deviceIdentifier, InputDeviceConfigurationFileType type,

        const char* suffix) {

    if (deviceIdentifier.vendor !=0 && deviceIdentifier.product != 0) {

        if (deviceIdentifier.version != 0) {

            // Try vendor product version.

            std::string versionPath = getInputDeviceConfigurationFilePathByName(

                    StringPrintf("Vendor_%04x_Product_%04x_Version_%04x",

                            deviceIdentifier.vendor, deviceIdentifier.product,

                            deviceIdentifier.version),

            std::string versionPath =

                    getInputDeviceConfigurationFilePathByName(StringPrintf("Vendor_%04x_Product_%"

                                                                           "04x_Version_%04x%s",

                                                                           deviceIdentifier.vendor,

                                                                           deviceIdentifier.product,

                                                                           deviceIdentifier.version,

                                                                           suffix),

                                                              type);

            if (!versionPath.empty()) {

                return versionPath;
@@ -69,9 +72,11 @@ std::string getInputDeviceConfigurationFilePathByDeviceIdentifier( 
        }



        // Try vendor product.

        std::string productPath = getInputDeviceConfigurationFilePathByName(

                StringPrintf("Vendor_%04x_Product_%04x",

                        deviceIdentifier.vendor, deviceIdentifier.product),

        std::string productPath =

                getInputDeviceConfigurationFilePathByName(StringPrintf("Vendor_%04x_Product_%04x%s",

                                                                       deviceIdentifier.vendor,

                                                                       deviceIdentifier.product,

                                                                       suffix),

                                                          type);

        if (!productPath.empty()) {

            return productPath;
@@ -79,7 +84,8 @@ std::string getInputDeviceConfigurationFilePathByDeviceIdentifier( 
    }



    // Try device name.

    return getInputDeviceConfigurationFilePathByName(deviceIdentifier.getCanonicalName(), type);

    return getInputDeviceConfigurationFilePathByName(deviceIdentifier.getCanonicalName() + suffix,

                                                     type);

}



std::string getInputDeviceConfigurationFilePathByName(