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

Commit b01eea0a authored by Dan Stoza's avatar Dan Stoza Committed by Android Git Automerger
Browse files

am 32ad1d51: am 104e1259: Merge "binder: Return pid_t/uid_t instead of int" 

* commit '32ad1d51':
  binder: Return pid_t/uid_t instead of int
parents c4764f9e 32ad1d51

include/binder/IPCThreadState.h

+2 −2
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ public: 
            

            status_t            clearLastError();



            int                 getCallingPid() const;

            int                 getCallingUid() const;

            pid_t               getCallingPid() const;

            uid_t               getCallingUid() const;



            void                setStrictModePolicy(int32_t policy);

            int32_t             getStrictModePolicy() const;

libs/binder/IPCThreadState.cpp

+2 −2
Original line number Diff line number Diff line
@@ -350,12 +350,12 @@ status_t IPCThreadState::clearLastError() 
    return err;

}



int IPCThreadState::getCallingPid() const

pid_t IPCThreadState::getCallingPid() const

{

    return mCallingPid;

}



int IPCThreadState::getCallingUid() const

uid_t IPCThreadState::getCallingUid() const

{

    return mCallingUid;

}