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

Commit f19b0928 authored by Devin Moore's avatar Devin Moore
Browse files

Change IInterface default_impl to use sp<> 

Make it simpler to use with existing interface APIs.
sp<> was used everywhere in IInterface except for default_impl.

Bug: 198787022
Test: m
Change-Id: I078c45bd9154f0281ac870850e190d874e1fca83
parent 8fc5367b

libs/binder/include/binder/IInterface.h

+17 −17
Original line number Diff line number Diff line
@@ -96,17 +96,17 @@ protected: 
#define DECLARE_META_INTERFACE(INTERFACE)                                                         \

public:                                                                                           \

    static const ::android::String16 descriptor;                                                  \

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

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

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

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

    I##INTERFACE();                                                                               \

    virtual ~I##INTERFACE();                                                                      \

    static bool setDefaultImpl(std::unique_ptr<I##INTERFACE> impl);     \

    static const std::unique_ptr<I##INTERFACE>& getDefaultImpl();       \

    static bool setDefaultImpl(::android::sp<I##INTERFACE> impl);                                 \

    static const ::android::sp<I##INTERFACE>& getDefaultImpl();                                   \

                                                                                                  \

private:                                                                                          \

    static std::unique_ptr<I##INTERFACE> default_impl;                  \

public:                                                                 \



    static ::android::sp<I##INTERFACE> default_impl;                                              \

                                                                                                  \

public:



#define __IINTF_CONCAT(x, y) (x ## y)
@@ -142,8 +142,8 @@ public: \ 
        }                                                                                          \

        return intr;                                                                               \

    }                                                                                              \

    std::unique_ptr<ITYPE> ITYPE::default_impl;                                                    \

    bool ITYPE::setDefaultImpl(std::unique_ptr<ITYPE> impl) {                                      \

    ::android::sp<ITYPE> ITYPE::default_impl;                                                      \

    bool ITYPE::setDefaultImpl(::android::sp<ITYPE> impl) {                                        \

        /* Only one user of this interface can use this function     */                            \

        /* at a time. This is a heuristic to detect if two different */                            \

        /* users in the same process use this function.              */                            \
@@ -154,7 +154,7 @@ public: \ 
        }                                                                                          \

        return false;                                                                              \

    }                                                                                              \

    const std::unique_ptr<ITYPE>& ITYPE::getDefaultImpl() { return ITYPE::default_impl; }          \

    const ::android::sp<ITYPE>& ITYPE::getDefaultImpl() { return ITYPE::default_impl; }            \

    ITYPE::INAME() {}                                                                              \

    ITYPE::~INAME() {}