summaryrefslogtreecommitdiffstats
path: root/core/jni
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-08-31 15:06:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-31 15:06:24 -0700
commit1423f51ec5fe2c9bf5fa44866443b2c52db165be (patch)
tree0ab080b873257293730980e9d2479045a1af2e2e /core/jni
parentfdf5b0808ff6f6a3c067dab17a9533cfd66229f1 (diff)
parentae087369c56a270c33c1c1af5be7d3c5d7f94e80 (diff)
downloadframeworks_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 'core/jni')
-rw-r--r--core/jni/android_util_Binder.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/jni/android_util_Binder.cpp b/core/jni/android_util_Binder.cpp
index 5c4e4fd..7a53874 100644
--- a/core/jni/android_util_Binder.cpp
+++ b/core/jni/android_util_Binder.cpp
@@ -270,6 +270,7 @@ protected:
IPCThreadState* thread_state = IPCThreadState::self();
const int strict_policy_before = thread_state->getStrictModePolicy();
+ thread_state->setLastTransactionBinderFlags(flags);
//printf("Transact from %p to Java code sending: ", this);
//data.print();