diff --git a/core/java/android/os/Binder.java b/core/java/android/os/Binder.java index fce3437db0496..8dcd93731aec0 100644 --- a/core/java/android/os/Binder.java +++ b/core/java/android/os/Binder.java @@ -122,14 +122,6 @@ public class Binder implements IBinder { private static native long getNativeFinalizer(); - /** - * Returns the TID (task ID) for the current thread. Same as {@link Thread#getNativeTid()} - * - * @hide - */ - @CriticalNative - public static native int getNativeTid(); - // Use a Holder to allow static initialization of Binder in the boot image, and // possibly to avoid some initialization ordering issues. private static class NoImagePreloadHolder { diff --git a/core/java/com/android/internal/os/BinderCallsStats.java b/core/java/com/android/internal/os/BinderCallsStats.java index aa42979ed53cf..b3e8db2052204 100644 --- a/core/java/com/android/internal/os/BinderCallsStats.java +++ b/core/java/com/android/internal/os/BinderCallsStats.java @@ -633,7 +633,7 @@ public class BinderCallsStats implements BinderInternal.Observer { } protected int getNativeTid() { - return Binder.getNativeTid(); + return Process.myTid(); } /** diff --git a/core/jni/android_util_Binder.cpp b/core/jni/android_util_Binder.cpp index 7c9b8625c8ee9..675648a594239 100644 --- a/core/jni/android_util_Binder.cpp +++ b/core/jni/android_util_Binder.cpp @@ -30,7 +30,6 @@ #include #include -#include #include #include #include @@ -1043,10 +1042,6 @@ static void android_os_Binder_setExtension(JNIEnv* env, jobject obj, jobject ext jbh->setExtension(extension); } -static jint android_os_Binder_getNativeTid() { - return (jint)android::base::GetThreadId(); -} - // ---------------------------------------------------------------------------- static const JNINativeMethod gBinderMethods[] = { @@ -1079,8 +1074,6 @@ static const JNINativeMethod gBinderMethods[] = { { "blockUntilThreadAvailable", "()V", (void*)android_os_Binder_blockUntilThreadAvailable }, { "getExtension", "()Landroid/os/IBinder;", (void*)android_os_Binder_getExtension }, { "setExtension", "(Landroid/os/IBinder;)V", (void*)android_os_Binder_setExtension }, - // @CriticalNative - { "getNativeTid", "()I", (void*)android_os_Binder_getNativeTid }, }; const char* const kBinderPathName = "android/os/Binder";