diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-06-21 15:31:01 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-06-21 15:31:01 -0700 |
| commit | ef8f96a717554a85aa63a60f8c61be2afbd12a5c (patch) | |
| tree | 0a6550aabca59a3e91a5a3d88bdd5351ce14d043 /include/binder | |
| parent | d91ac98a8ead216b12af6df61d90229b74c7f0f6 (diff) | |
| parent | 27b3a7a75960d026655f3acd1de8a672e80a5776 (diff) | |
| download | frameworks_base-ef8f96a717554a85aa63a60f8c61be2afbd12a5c.zip frameworks_base-ef8f96a717554a85aa63a60f8c61be2afbd12a5c.tar.gz frameworks_base-ef8f96a717554a85aa63a60f8c61be2afbd12a5c.tar.bz2 | |
Merge "Start of work on passing around StrictMode policy over Binder calls." into gingerbread
Diffstat (limited to 'include/binder')
| -rw-r--r-- | include/binder/IPCThreadState.h | 6 | ||||
| -rw-r--r-- | include/binder/Parcel.h | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/include/binder/IPCThreadState.h b/include/binder/IPCThreadState.h index 3ab985d..04e24d2 100644 --- a/include/binder/IPCThreadState.h +++ b/include/binder/IPCThreadState.h @@ -40,6 +40,9 @@ public: int getCallingPid(); int getCallingUid(); + + void setStrictModePolicy(int32_t policy); + int32_t getStrictModePolicy() const; int64_t clearCallingIdentity(); void restoreCallingIdentity(int64_t token); @@ -109,8 +112,9 @@ private: status_t mLastError; pid_t mCallingPid; uid_t mCallingUid; + int32_t mStrictModePolicy; }; - + }; // namespace android // --------------------------------------------------------------------------- diff --git a/include/binder/Parcel.h b/include/binder/Parcel.h index 66c34b2..2cc4db9 100644 --- a/include/binder/Parcel.h +++ b/include/binder/Parcel.h @@ -56,9 +56,12 @@ public: bool hasFileDescriptors() const; + // 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; - bool checkInterface(IBinder*) const; + bool checkInterface(IBinder*) const; void freeData(); |