commit f365affd27933d1d0771d0d5064101db18c19cc2
author Alex Light <allight@google.com> Mon Jan 27 13:43:01 2020 -0800
committer Treehugger Robot <treehugger-gerrit@google.com> Tue Jan 28 18:39:37 2020 +0000
tree b94a643c08f62a4355d3e7de143aa5e4f7b2d2e2
parent d71f1dc15e264f9d2122c427a4d99d49b525bfd3

Remove isDebuggerActive native implementation.

This function is identical to VMDebug#isDebuggerConnected and always
has been in ART (on dalvik there was a distinction between the two).
Simply implement this function in java to reduce the number of places
the debugger needs to overwrite native functions.

Test: build

Bug: 148401311
Change-Id: I56448e5c437900cb072aa39ee784a25efad260b0

runtime/native/dalvik_system_VMRuntime.cc

diff --git a/runtime/native/dalvik_system_VMRuntime.cc b/runtime/native/dalvik_system_VMRuntime.cc
index 8dd7ced..bb05e60 100644
--- a/runtime/native/dalvik_system_VMRuntime.cc
+++ b/runtime/native/dalvik_system_VMRuntime.cc
@@ -181,10 +181,6 @@
   Runtime::Current()->GetHeap()->ClampGrowthLimit();
 }
 
-static jboolean VMRuntime_isDebuggerActive(JNIEnv*, jobject) {
-  return Dbg::IsDebuggerActive();
-}
-
 static jboolean VMRuntime_isNativeDebuggable(JNIEnv*, jobject) {
   return Runtime::Current()->IsNativeDebuggable();
 }
@@ -787,7 +783,6 @@
   NATIVE_METHOD(VMRuntime, setHiddenApiExemptions, "([Ljava/lang/String;)V"),
   NATIVE_METHOD(VMRuntime, setHiddenApiAccessLogSamplingRate, "(I)V"),
   NATIVE_METHOD(VMRuntime, getTargetHeapUtilization, "()F"),
-  FAST_NATIVE_METHOD(VMRuntime, isDebuggerActive, "()Z"),
   FAST_NATIVE_METHOD(VMRuntime, isNativeDebuggable, "()Z"),
   NATIVE_METHOD(VMRuntime, isJavaDebuggable, "()Z"),
   NATIVE_METHOD(VMRuntime, nativeSetTargetHeapUtilization, "(F)V"),