commit 787d93d6bde750cf372c577586c34c3f115abd60
author Vic Yang <victoryang@google.com> Wed Sep 18 19:14:09 2019 +0000
committer Vic Yang <victoryang@google.com> Wed Sep 18 19:14:09 2019 +0000
tree 023f4982d94175e7f1b13ae1b8c03a5f0f4c5ce0
parent 63627157d8593fb760c717e0dc098d132eb6e148

Revert "binder: Use StaticString16 for interface descriptors"

This reverts commit 63627157d8593fb760c717e0dc098d132eb6e148.

Reason for revert: Breaking salfish and marlin.

Change-Id: I58a69d8df4e8e7431adc5fe9cfa4fd8c87e9f6af

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;                                \