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

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

Merge "binder: Use StaticString16 for interface descriptors" am: 8e34e87e am: 85956b93 

am: 6d9076ee

Change-Id: I8af7444a77fb405cd41768498c2f576944248e59
parents 13b2c2bb 6d9076ee

libs/binder/include/binder/IInterface.h

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

public:                                                                 \









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

#define IMPLEMENT_META_INTERFACE(INTERFACE, NAME)                       \

#define IMPLEMENT_META_INTERFACE(INTERFACE, NAME)                       \

    const ::android::String16 I##INTERFACE::descriptor(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&                                          \

    const ::android::String16&                                          \

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

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

        return I##INTERFACE::descriptor;                                \

        return I##INTERFACE::descriptor;                                \