summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-07-15 15:42:12 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-07-15 15:42:12 -0700
commitc4b204bdc4ab974f1f96814c93d8eaa750c15122 (patch)
tree0749fd997f18ca34067b8704062c22cc13d6cfbb /include
parent2c40582a6c3a5781b39d0504d5aa8934982989d2 (diff)
parent727de40c6bc7c6521a0542ea9def5d5c7b1c5e06 (diff)
downloadframeworks_base-c4b204bdc4ab974f1f96814c93d8eaa750c15122.zip
frameworks_base-c4b204bdc4ab974f1f96814c93d8eaa750c15122.tar.gz
frameworks_base-c4b204bdc4ab974f1f96814c93d8eaa750c15122.tar.bz2
Merge "More StrictMode work, keeping Binder & BlockGuard's thread-locals in-sync." into gingerbread
Diffstat (limited to 'include')
-rw-r--r--include/binder/Parcel.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/binder/Parcel.h b/include/binder/Parcel.h
index 3aba5f6..fd0fc1f 100644
--- a/include/binder/Parcel.h
+++ b/include/binder/Parcel.h
@@ -58,9 +58,13 @@ public:
// Writes the RPC header.
status_t writeInterfaceToken(const String16& interface);
+
// Parses the RPC header, returning true if the interface name
// in the header matches the expected interface from the caller.
- bool enforceInterface(const String16& interface) const;
+ // If strict_policy_out is non-NULL, the RPC header's StrictMode policy
+ // mask is returned.
+ bool enforceInterface(const String16& interface,
+ int32_t* strict_policy_out = NULL) const;
bool checkInterface(IBinder*) const;
void freeData();