From 8aa5d8a57ba0dcd4fef6e2ea9639b3a5bf5edc04 Mon Sep 17 00:00:00 2001
From: Satish Yalla <satishy@google.com>
Date: Tue, 2 Apr 2024 06:45:44 +0000
Subject: [PATCH] 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
---
 tests/msgq/1.0/default/mq_test_service.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/tests/msgq/1.0/default/mq_test_service.cpp b/tests/msgq/1.0/default/mq_test_service.cpp
index 66ad12f236..72ffe41b74 100644
--- a/tests/msgq/1.0/default/mq_test_service.cpp
+++ b/tests/msgq/1.0/default/mq_test_service.cpp
@@ -21,15 +21,13 @@
 #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::defaultPassthroughServiceImplementation;
-using android::hardware::isHidlSupported;
 using android::hardware::tests::msgq::V1_0::ITestMsgQ;
+using android::hardware::defaultPassthroughServiceImplementation;
 
 int main() {
     android::hardware::details::setTrebleTestingOverride(true);
@@ -41,10 +39,8 @@ 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);
-    }
+    // Register HIDL service
+    CHECK(defaultPassthroughServiceImplementation<ITestMsgQ>() == android::OK);
     ABinderProcess_joinThreadPool();
 
     return EXIT_FAILURE;  // should not reach