tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix fmq_test when HIDL is not supported

Browse source 
If HIDL is not supported on the device, don't expect to be able to
register the HIDL service.

Test: atest fmq_test
Bug: 218588089
Change-Id: I1764b26f06ef8f280f719d8ab44db2ebfe562944
This commit is contained in:
Devin Moore 2024-03-28 20:06:48 +00:00
parent f51a196bae
commit 85b7f66b77
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/msgq/1.0/default/mq_test_service.cpp
View file

@ -21,13 +21,15 @@
#include <android/binder_manager.h> #include <android/binder_manager.h>
#include <android/binder_process.h> #include <android/binder_process.h>
#include <android/hardware/tests/msgq/1.0/ITestMsgQ.h> #include <android/hardware/tests/msgq/1.0/ITestMsgQ.h>
#include <hidl/ServiceManagement.h>
using aidl::android::fmq::test::TestAidlMsgQ; using aidl::android::fmq::test::TestAidlMsgQ;
#include <hidl/LegacySupport.h> #include <hidl/LegacySupport.h>
using android::hardware::tests::msgq::V1_0::ITestMsgQ;
using android::hardware::defaultPassthroughServiceImplementation; using android::hardware::defaultPassthroughServiceImplementation;
using android::hardware::isHidlSupported;
using android::hardware::tests::msgq::V1_0::ITestMsgQ;
int main() { int main() {
android::hardware::details::setTrebleTestingOverride(true); android::hardware::details::setTrebleTestingOverride(true);
@ -39,8 +41,10 @@ int main() {
LOG(INFO) << "instance: " << instance; LOG(INFO) << "instance: " << instance;
CHECK(AServiceManager_addService(store->asBinder().get(), instance.c_str()) == STATUS_OK); CHECK(AServiceManager_addService(store->asBinder().get(), instance.c_str()) == STATUS_OK);
// Register HIDL service if (isHidlSupported()) {
CHECK(defaultPassthroughServiceImplementation<ITestMsgQ>() == android::OK); // Register HIDL service
CHECK(defaultPassthroughServiceImplementation<ITestMsgQ>() == android::OK);
}
ABinderProcess_joinThreadPool(); ABinderProcess_joinThreadPool();
return EXIT_FAILURE; // should not reach return EXIT_FAILURE; // should not reach