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

Commit 971986e2 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8717000 from 987a7e3f to tm-release 

Change-Id: I1fa3a0bc985ae8eb8ed79cccdc5fbdd2087eded0
parents b07b6138 987a7e3f

sensors/aidl/default/multihal/ConvertUtils.cpp

+3 −0
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ void convertToHidlEvent(const AidlEvent& aidlEvent, V2_1Event* hidlEvent) { 
            hidlEvent->u.vec3.x = aidlEvent.payload.get<Event::EventPayload::vec3>().x;

            hidlEvent->u.vec3.y = aidlEvent.payload.get<Event::EventPayload::vec3>().y;

            hidlEvent->u.vec3.z = aidlEvent.payload.get<Event::EventPayload::vec3>().z;

            hidlEvent->u.vec3.status =

                    (V1_0SensorStatus)aidlEvent.payload.get<Event::EventPayload::vec3>().status;

            break;

        case AidlSensorType::GAME_ROTATION_VECTOR:

            hidlEvent->u.vec4.x = aidlEvent.payload.get<Event::EventPayload::vec4>().x;
@@ -225,6 +227,7 @@ void convertToAidlEvent(const V2_1Event& hidlEvent, AidlEvent* aidlEvent) { 
            vec3.x = hidlEvent.u.vec3.x;

            vec3.y = hidlEvent.u.vec3.y;

            vec3.z = hidlEvent.u.vec3.z;

            vec3.status = (SensorStatus)hidlEvent.u.vec3.status;

            aidlEvent->payload.set<Event::EventPayload::vec3>(vec3);

            break;

        }

uwb/aidl/vts/VtsHalUwbTargetTest.cpp

+5 −0
Original line number Diff line number Diff line
@@ -68,6 +68,11 @@ class UwbAidl : public testing::TestWithParam<std::string> { 
        iuwb_ = IUwb::fromBinder(SpAIBinder(AServiceManager_waitForService(GetParam().c_str())));

        ASSERT_NE(iuwb_, nullptr);

    }

    virtual void TearDown() override {

        // Trigger HAL close at end of each test.

        const auto iuwb_chip = getAnyChip();

        iuwb_chip->close();

    }

    std::shared_ptr<IUwb> iuwb_;



    // TODO (b/197638976): We pick the first chip here. Need to fix this