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

Commit 54322025 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "libbinder: mark transact as final" am: 3f5fef58 am: 0c8cebf3 am:... 

Merge "libbinder: mark transact as final" am: 3f5fef58 am: 0c8cebf3 am: 37a0e176 am: 45c1fa79
am: 3ede5add

Change-Id: I0a5932e2f0990d341103710130619b94e86672cd
parents c79a84b8 3ede5add

libs/binder/include/binder/Binder.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -38,7 +38,7 @@ public: 
    virtual status_t    transact(   uint32_t code,

    virtual status_t    transact(   uint32_t code,

                                    const Parcel& data,

                                    const Parcel& data,

                                    Parcel* reply,

                                    Parcel* reply,

                                    uint32_t flags = 0);

                                    uint32_t flags = 0) final;





    // NOLINTNEXTLINE(google-default-arguments)

    // NOLINTNEXTLINE(google-default-arguments)

    virtual status_t    linkToDeath(const sp<DeathRecipient>& recipient,

    virtual status_t    linkToDeath(const sp<DeathRecipient>& recipient,

libs/binder/include/binder/BpBinder.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -45,7 +45,7 @@ public: 
    virtual status_t    transact(   uint32_t code,

    virtual status_t    transact(   uint32_t code,

                                    const Parcel& data,

                                    const Parcel& data,

                                    Parcel* reply,

                                    Parcel* reply,

                                    uint32_t flags = 0);

                                    uint32_t flags = 0) final;





    // NOLINTNEXTLINE(google-default-arguments)

    // NOLINTNEXTLINE(google-default-arguments)

    virtual status_t    linkToDeath(const sp<DeathRecipient>& recipient,

    virtual status_t    linkToDeath(const sp<DeathRecipient>& recipient,