From 702ea9d42f52fc145090c0f0bfbe64993e4b8b33 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Fri, 18 Jun 2010 13:07:53 -0700 Subject: Start of work on passing around StrictMode policy over Binder calls. This is (intendend to be) a no-op change. At this stage, Binder RPCs just have an additional uint32 passed around in the header, right before the interface name. But nothing is actually done with them yet. That value should right now always be 0. This now boots and seems to work. Change-Id: I135b7c84f07575e6b9717fef2424d301a450df7b --- include/binder/IPCThreadState.h | 6 +++++- include/binder/Parcel.h | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'include/binder') 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(); -- cgit v1.1