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

Commit c0f7480b authored by Joe Onorato's avatar Joe Onorato
Browse files

Fully qualify the namespaces in the META_INTERFACE macros. 

So that when they're inside a package that contains android,
like com::android, they identify the right namespace.

Test: make
Change-Id: Ib2e4436c1a9971024717a4a4ac8a83dc591a963e
parent f360899b

include/binder/IInterface.h

+9 −9
Original line number Diff line number Diff line
@@ -72,24 +72,24 @@ protected: 
// ----------------------------------------------------------------------



#define DECLARE_META_INTERFACE(INTERFACE)                               \

    static const android::String16 descriptor;                          \

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

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

    virtual const android::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 android::String16 I##INTERFACE::descriptor(NAME);             \

    const android::String16&                                            \

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

    const ::android::String16&                                          \

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

        return I##INTERFACE::descriptor;                                \

    }                                                                   \

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

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

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

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

    {                                                                   \

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

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

        if (obj != NULL) {                                              \

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

                obj->queryLocalInterface(                               \