diff options
| author | 2019-09-18 12:43:30 -0700 | |
|---|---|---|
| committer | 2019-09-18 12:43:30 -0700 | |
| commit | cd28044ff4698c40a318de00ec3c71a17eea71ce (patch) | |
| tree | e20bb4021b22d2cfa8a8ef0e990732fc757d6bdb | |
| parent | 6d9076ee2ebf84d7a0d065dd7f5ab5f7c650b701 (diff) | |
| parent | a741edcd861d0fd627005702a97992095d69f398 (diff) | |
Merge "Revert "binder: Use StaticString16 for interface descriptors"" am: 343ac1d4bc
am: a741edcd86
Change-Id: Ia1f285f1758f9f433ed2ab5215543d78981dcbab
| -rw-r--r-- | libs/binder/include/binder/IInterface.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libs/binder/include/binder/IInterface.h b/libs/binder/include/binder/IInterface.h index adc1f05bb2..0d305608ca 100644 --- a/libs/binder/include/binder/IInterface.h +++ b/libs/binder/include/binder/IInterface.h @@ -88,12 +88,8 @@ private: \ public: \ -#define __IINTF_CONCAT(x, y) (x ## y) #define IMPLEMENT_META_INTERFACE(INTERFACE, 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::descriptor(NAME); \ const ::android::String16& \ I##INTERFACE::getInterfaceDescriptor() const { \ return I##INTERFACE::descriptor; \ |