diff options
| author | Devin Moore <devinmoore@google.com> | 2024-01-23 16:43:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-01-23 16:43:24 +0000 |
| commit | 8c8ff6a358b59588646589583ed2424177428db7 (patch) | |
| tree | cdb52d34d3ea1b2550e3dedb69fc200ee2b99d3c | |
| parent | 4215470145c667e7a54ef0e7dc3de469f1c512c2 (diff) | |
| download | hwservicemanager-8c8ff6a358b59588646589583ed2424177428db7.tar.gz | |
Revert "Stop registering android.hidl.token"
Revert submission 2609329-remove_token_mgr
Reason for revert: Possibly causing problems in camera b/319296035
Reverted changes: /q/submissionid:2609329-remove_token_mgr
Change-Id: I5ac3399a9ca12e9b9d34734865a26501e047ad8a
| -rw-r--r-- | hwservicemanager.xml | 2 | ||||
| -rw-r--r-- | service.cpp | 15 |
2 files changed, 4 insertions, 13 deletions
diff --git a/hwservicemanager.xml b/hwservicemanager.xml index 2bff501..65220d8 100644 --- a/hwservicemanager.xml +++ b/hwservicemanager.xml @@ -8,7 +8,7 @@ <instance>default</instance> </interface> </hal> - <hal max-level="8"> + <hal> <name>android.hidl.token</name> <transport>hwbinder</transport> <version>1.0</version> diff --git a/service.cpp b/service.cpp index 6b11372..3766bc5 100644 --- a/service.cpp +++ b/service.cpp @@ -36,7 +36,6 @@ #include "ServiceManager.h" #include "TokenManager.h" -#include "Vintf.h" // libutils: using android::sp; @@ -167,17 +166,9 @@ int main() { ALOGE("Failed to register hwservicemanager with itself."); } - // Check to make sure we should be registering tokenManager first. Only if - // it's declared in the manifest. - sp<TokenManager> tokenManager; - if (android::vintf::Transport::EMPTY != - android::hardware::getTransport(TokenManager::descriptor, serviceName)) { - tokenManager = new TokenManager(); - if (!manager->add(serviceName, tokenManager).withDefault(false)) { - ALOGE("Failed to register ITokenManager with hwservicemanager."); - } - } else { - ALOGW("Not registering android.hidl.token service because it is no longer supported"); + sp<TokenManager> tokenManager = new TokenManager(); + if (!manager->add(serviceName, tokenManager).withDefault(false)) { + ALOGE("Failed to register ITokenManager with hwservicemanager."); } // Tell IPCThreadState we're the service manager |