From 1a302fb4f84525289c1cf7a437f5be1999a75251 Mon Sep 17 00:00:00 2001 From: Jeff Hao Date: Wed, 27 May 2015 19:29:29 -0700 Subject: Fix updating of JNI references for String.. Was missing updates to globals and weak globals. Bug: 21288130 Bug: 21440428 Change-Id: I5f801f68b61f6b066b441b92ace367e6ba434789 --- runtime/java_vm_ext.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'runtime/java_vm_ext.h') diff --git a/runtime/java_vm_ext.h b/runtime/java_vm_ext.h index deec6a98f3..594027c3c9 100644 --- a/runtime/java_vm_ext.h +++ b/runtime/java_vm_ext.h @@ -125,9 +125,17 @@ class JavaVMExt : public JavaVM { mirror::Object* DecodeGlobal(Thread* self, IndirectRef ref) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); + void UpdateGlobal(Thread* self, IndirectRef ref, mirror::Object* result) + SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) + LOCKS_EXCLUDED(globals_lock_); + mirror::Object* DecodeWeakGlobal(Thread* self, IndirectRef ref) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); + void UpdateWeakGlobal(Thread* self, IndirectRef ref, mirror::Object* result) + SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) + LOCKS_EXCLUDED(weak_globals_lock_); + const JNIInvokeInterface* GetUncheckedFunctions() const { return unchecked_functions_; } -- cgit v1.2.3