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 /libs/binder/IPCThreadState.cpp | |
| 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 'libs/binder/IPCThreadState.cpp')
| -rw-r--r-- | libs/binder/IPCThreadState.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp index 28706ba..f6582e6 100644 --- a/libs/binder/IPCThreadState.cpp +++ b/libs/binder/IPCThreadState.cpp @@ -372,8 +372,8 @@ void IPCThreadState::setStrictModePolicy(int32_t policy) mStrictModePolicy = policy; } - -int32_t IPCThreadState::getStrictModePolicy() const { +int32_t IPCThreadState::getStrictModePolicy() const +{ return mStrictModePolicy; } |