commit c60494ab985bc9a3f52136f11b08c104e709c561
author Vic Yang <victoryang@google.com> Wed Sep 18 12:50:18 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Sep 18 12:50:18 2019 -0700
tree 447855502a526ab49e42032884d1da3e18e3b3b1
parent d0a02127254fda0be05c8aaef0e17f619fd80548
parent cd28044ff4698c40a318de00ec3c71a17eea71ce

Merge "Revert "binder: Use StaticString16 for interface descriptors"" am: 343ac1d4bc am: a741edcd86
am: cd28044ff4

Change-Id: I8711d8105b66bb3b64aa7e8b0084d0e361daf0ae

libs/binder/include/binder/IInterface.h

diff --git a/libs/binder/include/binder/IInterface.h b/libs/binder/include/binder/IInterface.h
index adc1f05..0d30560 100644
--- a/libs/binder/include/binder/IInterface.h
+++ b/libs/binder/include/binder/IInterface.h
@@ -88,12 +88,8 @@
 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;                                \