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

Commit b9e29b6f authored by Vaibhav Devmurari's avatar Vaibhav Devmurari Committed by Android (Google) Code Review
Browse files

Merge "Correctly convert std::string to rust::String" into main

parents 8c3e2685 31b9016a

libs/input/KeyboardClassifier.cpp

+4 −4
Original line number Diff line number Diff line
@@ -57,14 +57,14 @@ void KeyboardClassifier::notifyKeyboardChanged(DeviceId deviceId, 
                                               uint32_t deviceClasses) {

    if (mRustClassifier) {

        RustInputDeviceIdentifier rustIdentifier;

        rustIdentifier.name = identifier.name;

        rustIdentifier.location = identifier.location;

        rustIdentifier.unique_id = identifier.uniqueId;

        rustIdentifier.name = rust::String::lossy(identifier.name);

        rustIdentifier.location = rust::String::lossy(identifier.location);

        rustIdentifier.unique_id = rust::String::lossy(identifier.uniqueId);

        rustIdentifier.bus = identifier.bus;

        rustIdentifier.vendor = identifier.vendor;

        rustIdentifier.product = identifier.product;

        rustIdentifier.version = identifier.version;

        rustIdentifier.descriptor = identifier.descriptor;

        rustIdentifier.descriptor = rust::String::lossy(identifier.descriptor);

        android::input::keyboardClassifier::notifyKeyboardChanged(**mRustClassifier, deviceId,

                                                                  rustIdentifier, deviceClasses);

    } else {