diff options
| author | 2019-09-18 12:57:25 -0700 | |
|---|---|---|
| committer | 2019-09-18 12:57:25 -0700 | |
| commit | c388ddd2e441e65d2b4cd8fc65252f7f4d0400a9 (patch) | |
| tree | 6b07929a0cfe04d0c8e115727fa2334194d0f5e9 /libs | |
| parent | 0a7fc3d61c24e461ff39dc93a7176f879030651a (diff) | |
| parent | c60494ab985bc9a3f52136f11b08c104e709c561 (diff) | |
Merge "Revert "binder: Use StaticString16 for interface descriptors"" am: 343ac1d4bc am: a741edcd86 am: cd28044ff4
am: c60494ab98
Change-Id: I5d1a0551cf92602359a8b4e8a427296eeaf9e18c
Diffstat (limited to 'libs')
| -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; \ |