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

Commit d5f5cc20 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libbinder: hide record/replay APIs from Binder.h" am: 3f4fec9c am:... 

Merge "libbinder: hide record/replay APIs from Binder.h" am: 3f4fec9c am: 42d1eaed am: 12307afe am: 9300035a am: 6edafd07

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



Change-Id: I48e99f05205b86c594cb25805ce318895b93ed0e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9ecf7249 6edafd07

libs/binder/include/binder/Binder.h

+2 −6
Original line number Diff line number Diff line
@@ -105,12 +105,6 @@ public: 
    [[nodiscard]] status_t setRpcClientDebug(android::base::unique_fd clientFd,

                                             const sp<IBinder>& keepAliveBinder);



    // Start recording transactions to the unique_fd in data.

    // See RecordedTransaction.h for more details.

    [[nodiscard]] status_t startRecordingTransactions(const Parcel& data);

    // Stop the current recording.

    [[nodiscard]] status_t stopRecordingTransactions();



protected:

    virtual             ~BBinder();
@@ -131,6 +125,8 @@ private: 


    [[nodiscard]] status_t setRpcClientDebug(const Parcel& data);

    void removeRpcServerLink(const sp<RpcServerLink>& link);

    [[nodiscard]] status_t startRecordingTransactions(const Parcel& data);

    [[nodiscard]] status_t stopRecordingTransactions();



    std::atomic<Extras*> mExtras;