diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-08-31 15:06:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-31 15:06:24 -0700 |
| commit | 1423f51ec5fe2c9bf5fa44866443b2c52db165be (patch) | |
| tree | 0ab080b873257293730980e9d2479045a1af2e2e /include/binder | |
| parent | fdf5b0808ff6f6a3c067dab17a9533cfd66229f1 (diff) | |
| parent | ae087369c56a270c33c1c1af5be7d3c5d7f94e80 (diff) | |
| download | frameworks_base-1423f51ec5fe2c9bf5fa44866443b2c52db165be.zip frameworks_base-1423f51ec5fe2c9bf5fa44866443b2c52db165be.tar.gz frameworks_base-1423f51ec5fe2c9bf5fa44866443b2c52db165be.tar.bz2 | |
am ae087369: am 63070856: Merge "Don\'t propagate StrictMode over one-way Binder calls." into gingerbread
Merge commit 'ae087369c56a270c33c1c1af5be7d3c5d7f94e80'
* commit 'ae087369c56a270c33c1c1af5be7d3c5d7f94e80':
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 |