diff options
| author | Dan Stoza <stoza@google.com> | 2014-12-01 19:23:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-01 19:23:22 +0000 |
| commit | 32ad1d518b8e89b487c8da2f6ec29c9a30ee5529 (patch) | |
| tree | 21f9acd5f073e3ac3c532d805236dfe96a940849 /libs/binder | |
| parent | 7d831769fce188251afb02e6b933be7bdfe504b4 (diff) | |
| parent | 104e12594e085bc8dd32eedb96643b774b1508a0 (diff) | |
| download | frameworks_native-32ad1d518b8e89b487c8da2f6ec29c9a30ee5529.zip frameworks_native-32ad1d518b8e89b487c8da2f6ec29c9a30ee5529.tar.gz frameworks_native-32ad1d518b8e89b487c8da2f6ec29c9a30ee5529.tar.bz2 | |
am 104e1259: Merge "binder: Return pid_t/uid_t instead of int"
* commit '104e12594e085bc8dd32eedb96643b774b1508a0':
binder: Return pid_t/uid_t instead of int
Diffstat (limited to 'libs/binder')
| -rw-r--r-- | libs/binder/IPCThreadState.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp index 8633691..2043d54 100644 --- a/libs/binder/IPCThreadState.cpp +++ b/libs/binder/IPCThreadState.cpp @@ -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; } |