diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-07-27 14:04:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-27 14:04:14 -0700 |
| commit | 84fabc0ce3d7c3da73903380d0d6141d60fa4448 (patch) | |
| tree | 7fc1a8cf6897f7ada12afe7cca8b883c4f912be3 /libs | |
| parent | ebd19e0f48b0cb246c246274a256a9bb494b7e7a (diff) | |
| parent | 245cb7846c82f7c0840e13f0b994d356846b1678 (diff) | |
| download | frameworks_base-84fabc0ce3d7c3da73903380d0d6141d60fa4448.zip frameworks_base-84fabc0ce3d7c3da73903380d0d6141d60fa4448.tar.gz frameworks_base-84fabc0ce3d7c3da73903380d0d6141d60fa4448.tar.bz2 | |
am 245cb784: am 84c924a6: Merge "Replace several IPCThreadState::get() lookups with one." into gingerbread
Merge commit '245cb7846c82f7c0840e13f0b994d356846b1678'
* commit '245cb7846c82f7c0840e13f0b994d356846b1678':
Replace several IPCThreadState::get() lookups with one.
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/binder/Parcel.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index 60babad..18f75df 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -458,13 +458,13 @@ bool Parcel::checkInterface(IBinder* binder) const } bool Parcel::enforceInterface(const String16& interface, - int32_t* strict_policy_out) const + IPCThreadState* threadState) const { - int32_t strict_policy = readInt32(); - IPCThreadState::self()->setStrictModePolicy(strict_policy); - if (strict_policy_out != NULL) { - *strict_policy_out = strict_policy; + int32_t strictPolicy = readInt32(); + if (threadState == NULL) { + threadState = IPCThreadState::self(); } + threadState->setStrictModePolicy(strictPolicy); const String16 str(readString16()); if (str == interface) { return true; |