diff options
author | Devin Moore <devinmoore@google.com> | 2024-03-26 20:31:31 +0000 |
---|---|---|
committer | Devin Moore <devinmoore@google.com> | 2024-04-05 21:55:38 +0000 |
commit | 6d1e2e2fdcede817b4d708fb1fa6148adad8d439 (patch) | |
tree | 844e87ce8ee189253f191c00e6f719a373c10982 | |
parent | fbaf71c318f38d63c2a5b2fa2512b46f9f3d59e3 (diff) | |
download | hwservicemanager-6d1e2e2fdcede817b4d708fb1fa6148adad8d439.tar.gz |
Deprecate hwservicemanager
Good bye HIDL.
Test: launch_cvd
Test: atest vts_treble_vintf_framework_test vts_treble_no_hidl
Test: atest vts_treble_vintf_vendor_test
Bug: 218588089
Merged-In: Ia17e8a57eecdba6167653b222d4b503f11af56f2
Change-Id: I6ed0bb8fce2dc712c739b3cee65bd55691b5de8a
-rw-r--r-- | hwservicemanager.xml | 2 | ||||
-rw-r--r-- | service.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/hwservicemanager.xml b/hwservicemanager.xml index 2bff501..cd60550 100644 --- a/hwservicemanager.xml +++ b/hwservicemanager.xml @@ -1,5 +1,5 @@ <manifest version="1.0" type="framework"> - <hal> + <hal max-level="8"> <name>android.hidl.manager</name> <transport>hwbinder</transport> <version>1.2</version> diff --git a/service.cpp b/service.cpp index 6b11372..ec8cef1 100644 --- a/service.cpp +++ b/service.cpp @@ -147,7 +147,8 @@ int main() { // TODO(b/36424585): make fatal ProcessState::self()->setCallRestriction(ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY); - if (!android::hardware::isHidlSupported()) { + auto transport = android::hardware::getTransport(ServiceManager::descriptor, serviceName); + if (transport == android::vintf::Transport::EMPTY) { ALOGI("HIDL is not supported on this device so hwservicemanager is not needed"); int rc = property_set("hwservicemanager.disabled", "true"); if (rc) { |