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

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

Merge changes Ia43d6dae,I09ec7969 

am: f03997b7

Change-Id: I147769b7f712c08df15511e6a33afc7b1c887845
parents 75f9ebc5 f03997b7

libs/binder/Parcel.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -541,7 +541,7 @@ bool Parcel::replaceCallingWorkSourceUid(uid_t uid) 
    return err == NO_ERROR;

    return err == NO_ERROR;

}

}





uid_t Parcel::readCallingWorkSourceUid()

uid_t Parcel::readCallingWorkSourceUid() const

{

{

    if (!mRequestHeaderPresent) {

    if (!mRequestHeaderPresent) {

        return IPCThreadState::kUnsetWorkSource;

        return IPCThreadState::kUnsetWorkSource;

libs/binder/include/binder/Parcel.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -377,8 +377,7 @@ public: 
    bool                replaceCallingWorkSourceUid(uid_t uid);

    bool                replaceCallingWorkSourceUid(uid_t uid);

    // Returns the work source provided by the caller. This can only be trusted for trusted calling

    // Returns the work source provided by the caller. This can only be trusted for trusted calling

    // uid.

    // uid.

    uid_t               readCallingWorkSourceUid();

    uid_t               readCallingWorkSourceUid() const;

    void                readRequestHeaders() const;





private:

private:

    typedef void        (*release_func)(Parcel* parcel,

    typedef void        (*release_func)(Parcel* parcel,