diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-08-31 15:02:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-31 15:02:21 -0700 |
| commit | ae087369c56a270c33c1c1af5be7d3c5d7f94e80 (patch) | |
| tree | 98b7a269a568547da1ff97f15f08a722225e8f8e /include/binder | |
| parent | 6b52911cc7ba548fd3a240ca61eba510a8581e6f (diff) | |
| parent | 63070856d034a2819a26560bc7f2881e501c78b7 (diff) | |
| download | frameworks_base-ae087369c56a270c33c1c1af5be7d3c5d7f94e80.zip frameworks_base-ae087369c56a270c33c1c1af5be7d3c5d7f94e80.tar.gz frameworks_base-ae087369c56a270c33c1c1af5be7d3c5d7f94e80.tar.bz2 | |
am 63070856: Merge "Don\'t propagate StrictMode over one-way Binder calls." into gingerbread
Merge commit '63070856d034a2819a26560bc7f2881e501c78b7' into gingerbread-plus-aosp
* commit '63070856d034a2819a26560bc7f2881e501c78b7':
Don't propagate StrictMode over one-way Binder calls.
Diffstat (limited to 'include/binder')
| -rw-r--r-- | include/binder/IPCThreadState.h | 6 |
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 |