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

Commit dd0e9ebe authored by Devin Moore's avatar Devin Moore Committed by Automerger Merge Worker
Browse files

Merge "Fix fmq_test when HIDL is not supported" into main am: aeab14d5 

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



Change-Id: Ica0dd349324e2b2415001a1b7cc65d7ced2d79f5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cd8badc2 aeab14d5

tests/msgq/1.0/default/mq_test_service.cpp

+7 −3
Original line number Diff line number Diff line
@@ -21,13 +21,15 @@ 
#include <android/binder_manager.h>

#include <android/binder_process.h>

#include <android/hardware/tests/msgq/1.0/ITestMsgQ.h>

#include <hidl/ServiceManagement.h>



using aidl::android::fmq::test::TestAidlMsgQ;



#include <hidl/LegacySupport.h>



using android::hardware::tests::msgq::V1_0::ITestMsgQ;

using android::hardware::defaultPassthroughServiceImplementation;

using android::hardware::isHidlSupported;

using android::hardware::tests::msgq::V1_0::ITestMsgQ;



int main() {

    android::hardware::details::setTrebleTestingOverride(true);
@@ -39,8 +41,10 @@ int main() { 
    LOG(INFO) << "instance: " << instance;

    CHECK(AServiceManager_addService(store->asBinder().get(), instance.c_str()) == STATUS_OK);



    if (isHidlSupported()) {

        // Register HIDL service

        CHECK(defaultPassthroughServiceImplementation<ITestMsgQ>() == android::OK);

    }

    ABinderProcess_joinThreadPool();



    return EXIT_FAILURE;  // should not reach