diff options
| author | 2019-09-18 10:24:20 -0700 | |
|---|---|---|
| committer | 2019-09-18 10:24:20 -0700 | |
| commit | 6d9076ee2ebf84d7a0d065dd7f5ab5f7c650b701 (patch) | |
| tree | d05d7fc486f43b7800ab2455068be87e2d990866 | |
| parent | 45bc7a41a5d9a2a6ddf78faff3696dcbcd4b6c1f (diff) | |
| parent | 85956b93b5f7d813d14b6a1d8ef8d6e27ff86a2f (diff) | |
Merge "binder: Use StaticString16 for interface descriptors" am: 8e34e87e59
am: 85956b93b5
Change-Id: I39489887fd64b9b83ac1ad915cdad6134db4205b
| -rw-r--r-- | libs/binder/include/binder/IInterface.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libs/binder/include/binder/IInterface.h b/libs/binder/include/binder/IInterface.h index 0d305608ca..adc1f05bb2 100644 --- a/libs/binder/include/binder/IInterface.h +++ b/libs/binder/include/binder/IInterface.h @@ -88,8 +88,12 @@ private: \ public: \ +#define __IINTF_CONCAT(x, y) (x ## y) #define IMPLEMENT_META_INTERFACE(INTERFACE, NAME) \ - const ::android::String16 I##INTERFACE::descriptor(NAME); \ + const ::android::StaticString16 \ + I##INTERFACE##_descriptor_static_str16(__IINTF_CONCAT(u, NAME));\ + const ::android::String16 I##INTERFACE::descriptor( \ + I##INTERFACE##_descriptor_static_str16); \ const ::android::String16& \ I##INTERFACE::getInterfaceDescriptor() const { \ return I##INTERFACE::descriptor; \ |