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

Commit fc821e5d authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

merge from open-source master 

Change-Id: I08f1feae65b1dfc3f740d78654c267f2e3ae5e85
parents 07a4eb35 a3a884d9

include/binder/IInterface.h

+10 −7
Original line number Diff line number Diff line
@@ -72,21 +72,24 @@ protected: 
// ----------------------------------------------------------------------



#define DECLARE_META_INTERFACE(INTERFACE)                               \

    static const String16 descriptor;                                   \

    static sp<I##INTERFACE> asInterface(const sp<IBinder>& obj);        \

    virtual const String16& getInterfaceDescriptor() const;             \

    static const android::String16 descriptor;                          \

    static android::sp<I##INTERFACE> asInterface(                       \

            const android::sp<android::IBinder>& obj);                  \

    virtual const android::String16& getInterfaceDescriptor() const;    \

    I##INTERFACE();                                                     \

    virtual ~I##INTERFACE();                                            \





#define IMPLEMENT_META_INTERFACE(INTERFACE, NAME)                       \

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

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

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

    const android::String16&                                            \

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

        return I##INTERFACE::descriptor;                                \

    }                                                                   \

    sp<I##INTERFACE> I##INTERFACE::asInterface(const sp<IBinder>& obj)  \

    android::sp<I##INTERFACE> I##INTERFACE::asInterface(                \

            const android::sp<android::IBinder>& obj)                   \

    {                                                                   \

        sp<I##INTERFACE> intr;                                          \

        android::sp<I##INTERFACE> intr;                                 \

        if (obj != NULL) {                                              \

            intr = static_cast<I##INTERFACE*>(                          \

                obj->queryLocalInterface(                               \