Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c60494ab authored by Vic Yang's avatar Vic Yang Committed by android-build-merger
Browse files

Merge "Revert "binder: Use StaticString16 for interface descriptors"" am: 343ac1d4 am: a741edcd 

am: cd28044f

Change-Id: I8711d8105b66bb3b64aa7e8b0084d0e361daf0ae
parents d0a02127 cd28044f

libs/binder/include/binder/IInterface.h

+1 −5
Original line number Original line Diff line number Diff line
@@ -88,12 +88,8 @@ private: \ 
public:                                                                 \

public:                                                                 \









#define __IINTF_CONCAT(x, y) (x ## y)

#define IMPLEMENT_META_INTERFACE(INTERFACE, NAME)                       \

#define IMPLEMENT_META_INTERFACE(INTERFACE, NAME)                       \

    const ::android::StaticString16                                     \

    const ::android::String16 I##INTERFACE::descriptor(NAME);           \

        I##INTERFACE##_descriptor_static_str16(__IINTF_CONCAT(u, NAME));\

    const ::android::String16 I##INTERFACE::descriptor(                 \

        I##INTERFACE##_descriptor_static_str16);                        \

    const ::android::String16&                                          \

    const ::android::String16&                                          \

            I##INTERFACE::getInterfaceDescriptor() const {              \

            I##INTERFACE::getInterfaceDescriptor() const {              \

        return I##INTERFACE::descriptor;                                \

        return I##INTERFACE::descriptor;                                \