diff options
| author | Steven Moreland <smoreland@google.com> | 2021-01-22 19:19:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-22 19:19:19 +0000 |
| commit | bb5861031eea906aa2b4871938648b2db7d42c18 (patch) | |
| tree | 54b1563f07bcb0d6f972d289c820ee4676aaa929 | |
| parent | bbe96227871061a98940cce6f4c0013739242e98 (diff) | |
| parent | a8e8f13e8daeba50f8c5fabc753523da5890d1cd (diff) | |
| download | libhidl-bb5861031eea906aa2b4871938648b2db7d42c18.tar.gz | |
Merge "onRegistrationImpl: handle getTransport error" am: c958ae096a am: a8e8f13e8d
Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/1557026
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic91846f6813a24ab70f2dd15ade16a5adefe7366
| -rw-r--r-- | transport/ServiceManagement.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/transport/ServiceManagement.cpp b/transport/ServiceManagement.cpp index e0813e1..b51c600 100644 --- a/transport/ServiceManagement.cpp +++ b/transport/ServiceManagement.cpp @@ -839,7 +839,13 @@ status_t registerAsServiceInternal(const sp<IBase>& service, const std::string& if (kEnforceVintfManifest && !isTrebleTestingOverride()) { using Transport = IServiceManager1_0::Transport; - Transport transport = sm->getTransport(descriptor, name); + Return<Transport> transport = sm->getTransport(descriptor, name); + + if (!transport.isOk()) { + LOG(ERROR) << "Could not get transport for " << descriptor << "/" << name << ": " + << transport.description(); + return UNKNOWN_ERROR; + } if (transport != Transport::HWBINDER) { LOG(ERROR) << "Service " << descriptor << "/" << name |