diff options
| author | Dan Stoza <stoza@google.com> | 2014-12-01 19:10:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-01 19:10:58 +0000 |
| commit | 104e12594e085bc8dd32eedb96643b774b1508a0 (patch) | |
| tree | f7b00d3a9f21420fb3a74ec326e21d2183df0f0b | |
| parent | 46ca041f43e3d80029782b12c994b232dc01b5d5 (diff) | |
| parent | 9c634fd2d13722106d475b000b05babcce1f65be (diff) | |
| download | native-104e12594e085bc8dd32eedb96643b774b1508a0.tar.gz | |
Merge "binder: Return pid_t/uid_t instead of int"
| -rw-r--r-- | include/binder/IPCThreadState.h | 4 | ||||
| -rw-r--r-- | libs/binder/IPCThreadState.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/binder/IPCThreadState.h b/include/binder/IPCThreadState.h index b29c2668a9..60c2242490 100644 --- a/include/binder/IPCThreadState.h +++ b/include/binder/IPCThreadState.h @@ -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; diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp index 86336915d9..2043d542c5 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; } |