diff options
| author | Vic Yang <victoryang@google.com> | 2019-09-06 21:29:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-09-06 21:29:33 +0000 |
| commit | 48b66ef08b74440b1ca5da79d9ea9c6727a6d499 (patch) | |
| tree | b40fb9d0e67d7182574a50560f461a23913dc619 | |
| parent | 72a115477425d7b6478059d39689f5808e288460 (diff) | |
| parent | d3b60662546b1378dd44b9739a0576f2ced24bf3 (diff) | |
| download | libhidl-48b66ef08b74440b1ca5da79d9ea9c6727a6d499.tar.gz | |
Merge "Make hybrid interface descriptors StaticString16"
| -rw-r--r-- | transport/token/1.0/utils/include/hidl/HybridInterface.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/transport/token/1.0/utils/include/hidl/HybridInterface.h b/transport/token/1.0/utils/include/hidl/HybridInterface.h index 125d5e8..5c54d85 100644 --- a/transport/token/1.0/utils/include/hidl/HybridInterface.h +++ b/transport/token/1.0/utils/include/hidl/HybridInterface.h @@ -389,7 +389,10 @@ public: \ return getHalVariant().index(); \ } \ constexpr uint32_t I##INTERFACE::sGetHalTokenTransactionCode; \ - const ::android::String16 I##INTERFACE::descriptor(NAME); \ + static const ::android::StaticString16 I##INTERFACE##_desc_str16( \ + u##NAME); \ + const ::android::String16 I##INTERFACE::descriptor( \ + I##INTERFACE##_desc_str16); \ const ::android::String16& \ I##INTERFACE::getInterfaceDescriptor() const { \ return I##INTERFACE::descriptor; \ |