summaryrefslogtreecommitdiffstats
path: root/include/binder
diff options
context:
space:
mode:
authorDan Stoza <stoza@google.com>2014-12-01 19:23:22 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-01 19:23:22 +0000
commit32ad1d518b8e89b487c8da2f6ec29c9a30ee5529 (patch)
tree21f9acd5f073e3ac3c532d805236dfe96a940849 /include/binder
parent7d831769fce188251afb02e6b933be7bdfe504b4 (diff)
parent104e12594e085bc8dd32eedb96643b774b1508a0 (diff)
downloadframeworks_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 'include/binder')
-rw-r--r--include/binder/IPCThreadState.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/binder/IPCThreadState.h b/include/binder/IPCThreadState.h
index b29c266..60c2242 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;