diff options
| author | 2019-10-03 15:27:46 -0700 | |
|---|---|---|
| committer | 2019-10-03 15:27:46 -0700 | |
| commit | adbb90baf6164ef7a0ee16b387abfd61a9673f6d (patch) | |
| tree | 03523aafea3008f82818369da9b82c74a5c1fce9 | |
| parent | 4fe294085879495aae16002559be1c5b51d82fcc (diff) | |
| parent | dab8808c86413983fb1ee706ad266abdaf7d9512 (diff) | |
Merge "Reland "binder: Use StaticString16 for interface descriptors"" am: 409e34c881 am: 3d17a3b047 am: 2d4f561ca9
am: dab8808c86
Change-Id: Id2d2a2f905b0e1178cb7a3721d724b30f1938762
| -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 5793a1cf6b..28ffa48e32 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; \ |