summaryrefslogtreecommitdiffstats
path: root/include/binder
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-08-31 15:06:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-31 15:06:24 -0700
commitf3372f7ca355cbc8828f543937469e313e9500ec (patch)
tree5e221092fc72811b07297d13a0c13f376d68b519 /include/binder
parentdb0f5623318298290e9d90714dc519c8854ec30d (diff)
parent985f18ef3ac1d2e6d6aebcf1a819355846e228c2 (diff)
downloadframeworks_native-f3372f7ca355cbc8828f543937469e313e9500ec.zip
frameworks_native-f3372f7ca355cbc8828f543937469e313e9500ec.tar.gz
frameworks_native-f3372f7ca355cbc8828f543937469e313e9500ec.tar.bz2
am ae087369: am 63070856: Merge "Don\'t propagate StrictMode over one-way Binder calls." into gingerbread
Merge commit 'ae087369c56a270c33c1c1af5be7d3c5d7f94e80' * commit 'ae087369c56a270c33c1c1af5be7d3c5d7f94e80': Don't propagate StrictMode over one-way Binder calls.
Diffstat (limited to 'include/binder')
-rw-r--r--include/binder/IPCThreadState.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/binder/IPCThreadState.h b/include/binder/IPCThreadState.h
index 04e24d2..b54718f 100644
--- a/include/binder/IPCThreadState.h
+++ b/include/binder/IPCThreadState.h
@@ -43,7 +43,10 @@ public:
void setStrictModePolicy(int32_t policy);
int32_t getStrictModePolicy() const;
-
+
+ void setLastTransactionBinderFlags(int32_t flags);
+ int32_t getLastTransactionBinderFlags() const;
+
int64_t clearCallingIdentity();
void restoreCallingIdentity(int64_t token);
@@ -113,6 +116,7 @@ private:
pid_t mCallingPid;
uid_t mCallingUid;
int32_t mStrictModePolicy;
+ int32_t mLastTransactionBinderFlags;
};
}; // namespace android