Revert "Fix fmq_test when HIDL is not supported"

Revert submission 26722372-nomo_hidl

Reason for revert: <Reason for revert: Potential culprit for b/332395670- verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.>

Reverted changes: /q/submissionid:26722372-nomo_hidl

Change-Id: I65174dd90ce94bc7d39d7bbafa2dd51886a89eee
This commit is contained in:
Satish Yalla 2024-04-02 06:45:44 +00:00 committed by Android (Google) Code Review
parent 85b7f66b77
commit 8aa5d8a57b

View file

@ -21,15 +21,13 @@
#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::defaultPassthroughServiceImplementation;
using android::hardware::isHidlSupported;
using android::hardware::tests::msgq::V1_0::ITestMsgQ; using android::hardware::tests::msgq::V1_0::ITestMsgQ;
using android::hardware::defaultPassthroughServiceImplementation;
int main() { int main() {
android::hardware::details::setTrebleTestingOverride(true); android::hardware::details::setTrebleTestingOverride(true);
@ -41,10 +39,8 @@ 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);
if (isHidlSupported()) { // Register HIDL service
// Register HIDL service CHECK(defaultPassthroughServiceImplementation<ITestMsgQ>() == android::OK);
CHECK(defaultPassthroughServiceImplementation<ITestMsgQ>() == android::OK);
}
ABinderProcess_joinThreadPool(); ABinderProcess_joinThreadPool();
return EXIT_FAILURE; // should not reach return EXIT_FAILURE; // should not reach