commit 5cdd368de2b21bb4d5b9e621fce7b8b0e4ac5eec
author Rick Yiu <rickyiu@google.com> Sat Sep 26 07:12:40 2020 +0000
committer Rick Yiu <rickyiu@google.com> Fri Oct 02 12:23:51 2020 +0000
tree 01657e9e2aaef292bc82ffc906b1dc167c893259
parent 2d98dc23d6e9b74ef004d4358d6c3d53503b12a7

Revert "Add getNativeTid function"

Revert submission 1202786-setpriority

Reason for revert: will cause lock contention
Reverted Changes:
I46093c953:Use ThreadPrioritySetter to set thread priority
Ic13c13803:Add getNativeTid function
Ib486b7229:Implement the ThreadPrioritySetter interface

Bug: 139521784
Test: build pass
Change-Id: Ie13eee23321cf78cd8e0c4e06b5215936710d8d7

runtime/native/java_lang_Thread.cc

diff --git a/runtime/native/java_lang_Thread.cc b/runtime/native/java_lang_Thread.cc
index 5f21998..37b3fe6 100644
--- a/runtime/native/java_lang_Thread.cc
+++ b/runtime/native/java_lang_Thread.cc
@@ -112,13 +112,6 @@
   return -1;  // Unreachable.
 }
 
-static jint Thread_getNativeTid(JNIEnv* env, jobject java_thread) {
-  ScopedFastNativeObjectAccess soa(env);
-  MutexLock mu(soa.Self(), *Locks::thread_list_lock_);
-  Thread* thread = Thread::FromManagedThread(soa, java_thread);
-  return (thread != nullptr) ? thread->GetTid() : 0;
-}
-
 static jboolean Thread_holdsLock(JNIEnv* env, jclass, jobject java_object) {
   ScopedObjectAccess soa(env);
   ObjPtr<mirror::Object> object = soa.Decode<mirror::Object>(java_object);
@@ -205,7 +198,6 @@
   FAST_NATIVE_METHOD(Thread, currentThread, "()Ljava/lang/Thread;"),
   FAST_NATIVE_METHOD(Thread, interrupted, "()Z"),
   FAST_NATIVE_METHOD(Thread, isInterrupted, "()Z"),
-  FAST_NATIVE_METHOD(Thread, getNativeTid, "()I"),
   NATIVE_METHOD(Thread, nativeCreate, "(Ljava/lang/Thread;JZ)V"),
   NATIVE_METHOD(Thread, nativeGetStatus, "(Z)I"),
   NATIVE_METHOD(Thread, holdsLock, "(Ljava/lang/Object;)Z"),