diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-07-15 23:05:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-15 23:05:35 -0700 |
| commit | 9555a1323e846aba16e6a7f2e5d9a9227523e595 (patch) | |
| tree | 2f28645cc7f03ce41a4fa3d6c5a89b731e6cbc84 /include | |
| parent | 6ba776ad34a8029e4d0c784ce0092f1fcbc91bef (diff) | |
| parent | cc52121c4f88e9feb8404937bcbfff6e73084666 (diff) | |
| download | frameworks_base-9555a1323e846aba16e6a7f2e5d9a9227523e595.zip frameworks_base-9555a1323e846aba16e6a7f2e5d9a9227523e595.tar.gz frameworks_base-9555a1323e846aba16e6a7f2e5d9a9227523e595.tar.bz2 | |
am cc52121c: am c4b204bd: Merge "More StrictMode work, keeping Binder & BlockGuard\'s thread-locals in-sync." into gingerbread
Merge commit 'cc52121c4f88e9feb8404937bcbfff6e73084666'
* commit 'cc52121c4f88e9feb8404937bcbfff6e73084666':
More StrictMode work, keeping Binder & BlockGuard's thread-locals in-sync.
Diffstat (limited to 'include')
| -rw-r--r-- | include/binder/Parcel.h | 6 |
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(); |