am b7c97ec6: Merge "Provide more information about the runtime"

* commit 'b7c97ec6be8fa92c5593b1ab49b4a952a741c9fd':
  Provide more information about the runtime

2 files changed, 41 insertions, 0 deletions

diff --git a/libart/src/main/java/dalvik/system/VMRuntime.java b/libart/src/main/java/dalvik/system/VMRuntime.java
index ae65950..48b2dfa 100644
--- a/libart/src/main/java/dalvik/system/VMRuntime.java
+++ b/libart/src/main/java/dalvik/system/VMRuntime.java
@@ -89,6 +89,21 @@ public final class VMRuntime {
     public native String vmLibrary();
 
     /**
+     * Returns the VM's instruction set.
+     */
+    public native String vmInstructionSet();
+
+    /**
+     * Returns whether the VM is running in 64-bit mode.
+     */
+    public native boolean is64Bit();
+
+    /**
+     * Returns whether the VM is running with JNI checking enabled.
+     */
+    public native boolean isCheckJniEnabled();
+
+    /**
      * Gets the current ideal heap utilization, represented as a number
      * between zero and one.  After a GC happens, the Dalvik heap may
      * be resized so that (size of live objects) / (size of heap) is
diff --git a/libdvm/src/main/java/dalvik/system/VMRuntime.java b/libdvm/src/main/java/dalvik/system/VMRuntime.java
index d532210..0b0fdc2 100644
--- a/libdvm/src/main/java/dalvik/system/VMRuntime.java
+++ b/libdvm/src/main/java/dalvik/system/VMRuntime.java
@@ -87,6 +87,32 @@ public final class VMRuntime {
     public native String vmLibrary();
 
     /**
+     * Returns the VM's instruction set.
+     */
+    public String vmInstructionSet() {
+        return "";
+    }
+
+    /**
+     * Returns the VM's internal flags.
+     */
+    public String vmFlags() {
+        return "";
+    }
+
+    /**
+     * Returns whether the VM is running in 64-bit mode.
+     */
+    public boolean is64Bit() {
+        return false;
+    }
+
+    /**
+     * Returns whether the VM is running with JNI checking enabled.
+     */
+    public native boolean isCheckJniEnabled();
+
+    /**
      * Gets the current ideal heap utilization, represented as a number
      * between zero and one.  After a GC happens, the Dalvik heap may
      * be resized so that (size of live objects) / (size of heap) is