commit 2e9c940a714916f2edd39e9aec1b3f0d50351a2e
author Alex Light <allight@google.com> Tue Jan 28 10:45:35 2020 -0800
committer android-build-merger <android-build-merger@google.com> Tue Jan 28 10:45:35 2020 -0800
tree 668fceeff79163dbbf5d7704f173ff8bbed19c20
parent b691cf0146fbb0f24073b7766ad49fc20a57568e
parent df0a95af086d3551051afa2c1bea60287bc2c8ae

Merge "Remove isDebuggerActive function."
am: df0a95af08

Change-Id: Ie6fa725dbd35b0325b494b87e3a673bfeb42c517

libart/src/main/java/dalvik/system/VMRuntime.java

diff --git a/libart/src/main/java/dalvik/system/VMRuntime.java b/libart/src/main/java/dalvik/system/VMRuntime.java
index a97d7fc..6171cb6 100644
--- a/libart/src/main/java/dalvik/system/VMRuntime.java
+++ b/libart/src/main/java/dalvik/system/VMRuntime.java
@@ -475,12 +475,6 @@
     public native void clampGrowthLimit();
 
     /**
-     * Returns true if either a Java debugger or native debugger is active.
-     */
-    @FastNative
-    public native boolean isDebuggerActive();
-
-    /**
      * Returns true if native debugging is on.
      */
     @libcore.api.CorePlatformApi

libart/src/main/java/java/lang/Daemons.java

diff --git a/libart/src/main/java/java/lang/Daemons.java b/libart/src/main/java/java/lang/Daemons.java
index 183a588..568614f 100644
--- a/libart/src/main/java/java/lang/Daemons.java
+++ b/libart/src/main/java/java/lang/Daemons.java
@@ -29,6 +29,7 @@
 import libcore.util.EmptyArray;
 
 import dalvik.system.VMRuntime;
+import dalvik.system.VMDebug;
 
 /**
  * Calls Object.finalize() on objects in the finalizer reference queue. The VM
@@ -322,7 +323,7 @@
                     continue;
                 }
                 final Object finalizing = waitForFinalization();
-                if (finalizing != null && !VMRuntime.getRuntime().isDebuggerActive()) {
+                if (finalizing != null && !VMDebug.isDebuggerConnected()) {
                     finalizerTimedOut(finalizing);
                     break;
                 }