commit 89f67e96d6018342f79cd3b2417e6dc8f85ac9b0
author Stephen Hines <srhines@google.com> Thu Nov 27 13:54:29 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 27 13:54:29 2014 +0000
tree 75794ee230f92565f2a2219670451bb4df3f2872
parent 3edf1aac5718a095c3d3ad8024d56f32104142c0
parent 79bd7b1282c100447429a174ecd0646a5178f887

am 79bd7b12: am 7939a254: Merge "Add a missing SHARED_LOCKS_REQUIRED(mutator_lock_)."

* commit '79bd7b1282c100447429a174ecd0646a5178f887':
  Add a missing SHARED_LOCKS_REQUIRED(mutator_lock_).

runtime/jni_internal.cc

diff --git a/runtime/jni_internal.cc b/runtime/jni_internal.cc
index b62634f..658cb75 100644
--- a/runtime/jni_internal.cc
+++ b/runtime/jni_internal.cc
@@ -565,7 +565,8 @@
     return soa.AddLocalReference<jobject>(decoded_obj);
   }
 
-  static void DeleteLocalRef(JNIEnv* env, jobject obj) {
+  static void DeleteLocalRef(JNIEnv* env, jobject obj)
+      SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) {
     if (obj == nullptr) {
       return;
     }