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

Commit a791b2d9 authored by Hongguang Chen's avatar Hongguang Chen Committed by Automerger Merge Worker
Browse files

Merge "Revert "Placeholder for binder freeze notification API."" into main am: 5a1c5a12 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3161537



Change-Id: I692fc1f95560a25734fcef36057a98a585d9a071
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f07095b7 5a1c5a12

libs/binder/Binder.cpp

+0 −8
Original line number Diff line number Diff line
@@ -441,14 +441,6 @@ status_t BBinder::unlinkToDeath( 
    return INVALID_OPERATION;

}



status_t BBinder::addFrozenStateChangeCallback(const wp<FrozenStateChangeCallback>&) {

    return INVALID_OPERATION;

}



status_t BBinder::removeFrozenStateChangeCallback(const wp<FrozenStateChangeCallback>&) {

    return INVALID_OPERATION;

}



status_t BBinder::dump(int /*fd*/, const Vector<String16>& /*args*/)

{

    return NO_ERROR;

libs/binder/BpBinder.cpp

+0 −8
Original line number Diff line number Diff line
@@ -557,14 +557,6 @@ void BpBinder::sendObituary() 
    }

}



status_t BpBinder::addFrozenStateChangeCallback(const wp<FrozenStateChangeCallback>&) {

    return INVALID_OPERATION;

}



status_t BpBinder::removeFrozenStateChangeCallback(const wp<FrozenStateChangeCallback>&) {

    return INVALID_OPERATION;

}



void BpBinder::reportOneDeath(const Obituary& obit)

{

    sp<DeathRecipient> recipient = obit.recipient.promote();

libs/binder/include/binder/Binder.h

+0 −7
Original line number Diff line number Diff line
@@ -50,13 +50,6 @@ public: 
                                                      void* cookie = nullptr, uint32_t flags = 0,

                                                      wp<DeathRecipient>* outRecipient = nullptr);



    // Placeholders to test if adding virtual functions here breaks things.

    // Will be replaced by an actual API once things are verified to work.

    LIBBINDER_EXPORTED virtual status_t addFrozenStateChangeCallback(

            const wp<FrozenStateChangeCallback>& callback);

    LIBBINDER_EXPORTED virtual status_t removeFrozenStateChangeCallback(

            const wp<FrozenStateChangeCallback>& callback);



    LIBBINDER_EXPORTED virtual void* attachObject(const void* objectID, void* object,

                                                  void* cleanupCookie,

                                                  object_cleanup_func func) final;

libs/binder/include/binder/BpBinder.h

+0 −6
Original line number Diff line number Diff line
@@ -66,12 +66,6 @@ public: 
                                                      void* cookie = nullptr, uint32_t flags = 0,

                                                      wp<DeathRecipient>* outRecipient = nullptr);



    [[nodiscard]] virtual status_t addFrozenStateChangeCallback(

            const wp<FrozenStateChangeCallback>& recipient);



    [[nodiscard]] virtual status_t removeFrozenStateChangeCallback(

            const wp<FrozenStateChangeCallback>& recipient);



    LIBBINDER_EXPORTED virtual void* attachObject(const void* objectID, void* object,

                                                  void* cleanupCookie,

                                                  object_cleanup_func func) final;

libs/binder/include/binder/IBinder.h

+3 −14
Original line number Diff line number Diff line
@@ -198,11 +198,6 @@ public: 
        virtual void binderDied(const wp<IBinder>& who) = 0;

    };



    class FrozenStateChangeCallback : public virtual RefBase {

    public:

        virtual void onStateChanged(const wp<IBinder>& who, bool isFrozen) = 0;

    };



    #if defined(__clang__)

    #pragma clang diagnostic pop

    #endif
@@ -254,12 +249,6 @@ public: 
                                            uint32_t flags = 0,

                                            wp<DeathRecipient>* outRecipient = nullptr) = 0;



    // Placeholders. See Binder.h for details.

    [[nodiscard]] virtual status_t addFrozenStateChangeCallback(

            const wp<FrozenStateChangeCallback>& callback) = 0;

    [[nodiscard]] virtual status_t removeFrozenStateChangeCallback(

            const wp<FrozenStateChangeCallback>& callback) = 0;



    virtual bool            checkSubclass(const void* subclassID) const;



    typedef void (*object_cleanup_func)(const void* id, void* obj, void* cleanupCookie);