Add VMRuntime.runFinalizationWithTimeout

Used by native allocations to prevent deadlocks.

Bug: 21544853
Change-Id: I57b2f7ae8b74185922eb3c15ba0ab71a4d2348aa

1 files changed, 25 insertions, 0 deletions

diff --git a/libart/src/main/java/dalvik/system/VMRuntime.java b/libart/src/main/java/dalvik/system/VMRuntime.java
index b885ed2..aa3f154 100644
--- a/libart/src/main/java/dalvik/system/VMRuntime.java
+++ b/libart/src/main/java/dalvik/system/VMRuntime.java
@@ -16,6 +16,7 @@
 
 package dalvik.system;
 
+import java.lang.ref.FinalizerReference;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -301,6 +302,30 @@ public final class VMRuntime {
      */
     public native void registerNativeFree(int bytes);
 
+    /**
+     * Wait for objects to be finalized.
+     *
+     * If finalization takes longer than timeout, then the function returns before all objects are
+     * finalized.
+     *
+     * @param timeout
+     *            timeout in nanoseconds of the maximum time to wait until all pending finalizers
+     *            are run. If timeout is 0, then there is no timeout. Note that the timeout does
+     *            not stop the finalization process, it merely stops the wait.
+     *
+     * @see #Runtime.runFinalization()
+     * @see #wait(long,int)
+     */
+    public static void runFinalization(long timeout) {
+        try {
+            FinalizerReference.finalizeAllEnqueued(timeout);
+        } catch (InterruptedException e) {
+            // Interrupt the current thread without actually throwing the InterruptionException
+            // for the caller.
+            Thread.currentThread().interrupt();
+        }
+    }
+
     public native void requestConcurrentGC();
     public native void concurrentGC();
     public native void requestHeapTrim();