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

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

Merge "Rename files for RecordedTransaction" am: 1d5c6a06 am: 21077673 

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



Change-Id: I0b626520fbeea2b655a54e0b887551ebce01d931
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ffab144e 21077673

libs/binder/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ cc_defaults { 


    srcs: [

        "Binder.cpp",

        "BinderRecordReplay.cpp",

        "BpBinder.cpp",

        "Debug.cpp",

        "FdTrigger.cpp",
@@ -84,6 +83,7 @@ cc_defaults { 
        "IResultReceiver.cpp",

        "Parcel.cpp",

        "ParcelFileDescriptor.cpp",

        "RecordedTransaction.cpp",

        "RpcSession.cpp",

        "RpcServer.cpp",

        "RpcState.cpp",

libs/binder/Binder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -21,13 +21,13 @@ 


#include <android-base/logging.h>

#include <android-base/unique_fd.h>

#include <binder/BinderRecordReplay.h>

#include <binder/BpBinder.h>

#include <binder/IInterface.h>

#include <binder/IPCThreadState.h>

#include <binder/IResultReceiver.h>

#include <binder/IShellCallback.h>

#include <binder/Parcel.h>

#include <binder/RecordedTransaction.h>

#include <binder/RpcServer.h>

#include <cutils/compiler.h>

#include <private/android_filesystem_config.h>

libs/binder/BinderRecordReplay.cpp→libs/binder/RecordedTransaction.cpp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <android-base/file.h>

#include <android-base/logging.h>

#include <android-base/unique_fd.h>

#include <binder/BinderRecordReplay.h>

#include <binder/RecordedTransaction.h>

#include <sys/mman.h>

#include <algorithm>

libs/binder/include/binder/Binder.h

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ public: 
                                             const sp<IBinder>& keepAliveBinder);



    // Start recording transactions to the unique_fd in data.

    // See BinderRecordReplay.h for more details.

    // See RecordedTransaction.h for more details.

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

    // Stop the current recording.

    [[nodiscard]] status_t stopRecordingTransactions();

libs/binder/include/binder/BpBinder.h

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ public: 
    std::optional<int32_t> getDebugBinderHandle() const;



    // Start recording transactions to the unique_fd.

    // See BinderRecordReplay.h for more details.

    // See RecordedTransaction.h for more details.

    status_t startRecordingBinder(const android::base::unique_fd& fd);

    // Stop the current recording.

    status_t stopRecordingBinder();