diff options
author | Mathieu Chartier <mathieuc@google.com> | 2016-10-03 18:01:28 -0700 |
---|---|---|
committer | Mathieu Chartier <mathieuc@google.com> | 2016-10-04 10:46:16 -0700 |
commit | 1cc62e4ea24828fdb3f3da0b8603f0b107d09a04 (patch) | |
tree | 718e322f3d05ac095770d4dc2a68b824bf3974a7 /runtime/native/java_lang_Thread.cc | |
parent | 82d4838d6bb3480cd25327cedc5179fb2d86881c (diff) |
Rename ObjPtr::Decode to ObjPtr::Ptr
Done to prevent ambiguity with ScopedObjectAccess::Decode.
Bug: 31113334
Test: test-art-host
Change-Id: I07a2497cc9cf66386311798933547471987fc316
Diffstat (limited to 'runtime/native/java_lang_Thread.cc')
-rw-r--r-- | runtime/native/java_lang_Thread.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/native/java_lang_Thread.cc b/runtime/native/java_lang_Thread.cc index 063526150c..fcb017545a 100644 --- a/runtime/native/java_lang_Thread.cc +++ b/runtime/native/java_lang_Thread.cc @@ -116,7 +116,7 @@ static jboolean Thread_nativeHoldsLock(JNIEnv* env, jobject java_thread, jobject } MutexLock mu(soa.Self(), *Locks::thread_list_lock_); Thread* thread = Thread::FromManagedThread(soa, java_thread); - return thread->HoldsLock(object.Decode()); + return thread->HoldsLock(object.Ptr()); } static void Thread_nativeInterrupt(JNIEnv* env, jobject java_thread) { @@ -173,7 +173,7 @@ static void Thread_nativeSetPriority(JNIEnv* env, jobject java_thread, jint new_ static void Thread_sleep(JNIEnv* env, jclass, jobject java_lock, jlong ms, jint ns) { ScopedFastNativeObjectAccess soa(env); ObjPtr<mirror::Object> lock = soa.Decode<mirror::Object>(java_lock); - Monitor::Wait(Thread::Current(), lock.Decode(), ms, ns, true, kSleeping); + Monitor::Wait(Thread::Current(), lock.Ptr(), ms, ns, true, kSleeping); } /* |