ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

* commit '32ad1d518b8e89b487c8da2f6ec29c9a30ee5529':
  binder: Return pid_t/uid_t instead of int
This commit is contained in:
Dan Stoza 2014-12-01 19:29:11 +00:00 committed by Android Git Automerger
parent c4764f9e57 32ad1d518b
commit b01eea0a58
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/binder/IPCThreadState.h
View File

@ -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;

4
libs/binder/IPCThreadState.cpp
View File

@ -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;
}