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

Commit 69dbffb1 authored by Prabir Pradhan's avatar Prabir Pradhan Committed by Automerger Merge Worker
Browse files

Merge "InputVerifier: Accept invalid utf-8 strings silently" into udc-qpr-dev... 

Merge "InputVerifier: Accept invalid utf-8 strings silently" into udc-qpr-dev am: b381a8ba am: ebd5ab19

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



Change-Id: Ieda961e446aacec819929b738d1790b9faf237de
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 659ff001 ebd5ab19

libs/input/InputVerifier.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,7 @@ namespace android { 
// --- InputVerifier ---

// --- InputVerifier ---





InputVerifier::InputVerifier(const std::string& name)

InputVerifier::InputVerifier(const std::string& name)

      : mVerifier(android::input::verifier::create(name)){};

      : mVerifier(android::input::verifier::create(rust::String::lossy(name))){};





Result<void> InputVerifier::processMovement(DeviceId deviceId, int32_t action,

Result<void> InputVerifier::processMovement(DeviceId deviceId, int32_t action,

                                            uint32_t pointerCount,

                                            uint32_t pointerCount,

libs/input/tests/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ cc_test { 
        "InputDevice_test.cpp",

        "InputDevice_test.cpp",

        "InputEvent_test.cpp",

        "InputEvent_test.cpp",

        "InputPublisherAndConsumer_test.cpp",

        "InputPublisherAndConsumer_test.cpp",

        "InputVerifier_test.cpp",

        "MotionPredictor_test.cpp",

        "MotionPredictor_test.cpp",

        "RingBuffer_test.cpp",

        "RingBuffer_test.cpp",

        "TfLiteMotionPredictor_test.cpp",

        "TfLiteMotionPredictor_test.cpp",

libs/input/tests/InputVerifier_test.cpp

0 → 100644
+29 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include <gtest/gtest.h>

#include <input/InputVerifier.h>

#include <string>



namespace android {



TEST(InputVerifierTest, CreationWithInvalidUtfStringDoesNotCrash) {

    constexpr char bytes[] = {static_cast<char>(0xC0), static_cast<char>(0x80)};

    const std::string name(bytes, sizeof(bytes));

    InputVerifier verifier(name);

}



} // namespace android