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

Commit f3e0e175 authored by Sharjeel Khan's avatar Sharjeel Khan
Browse files

[conflict] Merge "Fix Wthread-safety-reference-return warnings" into main am:... 

[conflict] Merge "Fix Wthread-safety-reference-return warnings" into main am: 7aa8a0f9 am: 693bc6a0

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3449538



Bug: 391455120
Change-Id: Ic416e8474e79054cf926f9cb372c93171b956071
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4364d264 693bc6a0

automotive/vehicle/aidl/impl/3/fake_impl/hardware/test/FakeVehicleHardwareTest.cpp

+7 −5
Original line number Diff line number Diff line
@@ -223,7 +223,8 @@ class FakeVehicleHardwareTest : public ::testing::Test { 
            return status;

        }



        const SetValueResult& result = getSetValueResults().back();

        std::vector<SetValueResult> resultVector = getSetValueResults();

        const SetValueResult& result = resultVector.back();



        if (result.requestId != 0) {

            ALOGE("request ID mismatch, got %" PRId64 ", expect 0", result.requestId);
@@ -245,7 +246,8 @@ class FakeVehicleHardwareTest : public ::testing::Test { 
            return unexpected(status);

        }



        const GetValueResult& result = getGetValueResults().back();

        std::vector<GetValueResult> resultVector = getGetValueResults();

        const GetValueResult& result = resultVector.back();

        if (result.requestId != 0) {

            ALOGE("request ID mismatch, got %" PRId64 ", expect 0", result.requestId);

            return unexpected(StatusCode::INTERNAL_ERROR);
@@ -277,7 +279,7 @@ class FakeVehicleHardwareTest : public ::testing::Test { 
        mCv.notify_all();

    }



    const std::vector<SetValueResult>& getSetValueResults() {

    std::vector<SetValueResult> getSetValueResults() {

        std::scoped_lock<std::mutex> lockGuard(mLock);

        return mSetValueResults;

    }
@@ -291,7 +293,7 @@ class FakeVehicleHardwareTest : public ::testing::Test { 
        mCv.notify_all();

    }



    const std::vector<GetValueResult>& getGetValueResults() {

    std::vector<GetValueResult> getGetValueResults() {

        std::scoped_lock<std::mutex> lockGuard(mLock);

        return mGetValueResults;

    }
@@ -309,7 +311,7 @@ class FakeVehicleHardwareTest : public ::testing::Test { 
        mCv.notify_all();

    }



    const std::vector<VehiclePropValue>& getChangedProperties() {

    std::vector<VehiclePropValue> getChangedProperties() {

        std::scoped_lock<std::mutex> lockGuard(mLock);

        return mChangedProperties;

    }

automotive/vehicle/aidl/impl/current/fake_impl/hardware/test/FakeVehicleHardwareTest.cpp

+7 −5
Original line number Diff line number Diff line
@@ -223,7 +223,8 @@ class FakeVehicleHardwareTest : public ::testing::Test { 
            return status;

        }



        const SetValueResult& result = getSetValueResults().back();

        std::vector<SetValueResult> resultVector = getSetValueResults();

        const SetValueResult& result = resultVector.back();



        if (result.requestId != 0) {

            ALOGE("request ID mismatch, got %" PRId64 ", expect 0", result.requestId);
@@ -245,7 +246,8 @@ class FakeVehicleHardwareTest : public ::testing::Test { 
            return unexpected(status);

        }



        const GetValueResult& result = getGetValueResults().back();

        std::vector<GetValueResult> resultVector = getGetValueResults();

        const GetValueResult& result = resultVector.back();

        if (result.requestId != 0) {

            ALOGE("request ID mismatch, got %" PRId64 ", expect 0", result.requestId);

            return unexpected(StatusCode::INTERNAL_ERROR);
@@ -277,7 +279,7 @@ class FakeVehicleHardwareTest : public ::testing::Test { 
        mCv.notify_all();

    }



    const std::vector<SetValueResult>& getSetValueResults() {

    std::vector<SetValueResult> getSetValueResults() {

        std::scoped_lock<std::mutex> lockGuard(mLock);

        return mSetValueResults;

    }
@@ -291,7 +293,7 @@ class FakeVehicleHardwareTest : public ::testing::Test { 
        mCv.notify_all();

    }



    const std::vector<GetValueResult>& getGetValueResults() {

    std::vector<GetValueResult> getGetValueResults() {

        std::scoped_lock<std::mutex> lockGuard(mLock);

        return mGetValueResults;

    }
@@ -309,7 +311,7 @@ class FakeVehicleHardwareTest : public ::testing::Test { 
        mCv.notify_all();

    }



    const std::vector<VehiclePropValue>& getChangedProperties() {

    std::vector<VehiclePropValue> getChangedProperties() {

        std::scoped_lock<std::mutex> lockGuard(mLock);

        return mChangedProperties;

    }