summaryrefslogtreecommitdiff
path: root/Source/Android/app/src/main/java/org
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@gmail.com>2015-05-21 18:48:35 -0500
committerRyan Houdek <Sonicadvance1@gmail.com>2015-05-25 22:13:00 -0500
commitd789d8d75fda89d68a75e2ce605f082f379b8cfe (patch)
tree0168d62775675a9de9d0b87110404b942aed4030 /Source/Android/app/src/main/java/org
parent7c04c76a26484184c59a406a16cd278751d417c2 (diff)
[Android] Add support for panic alerts to the JNI.
Diffstat (limited to 'Source/Android/app/src/main/java/org')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java15
1 files changed, 15 insertions, 0 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
index 79fedf6789..12259de37b 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
@@ -217,6 +217,21 @@ public final class NativeLibrary
*/
public static native void WriteProfileResults();
+ /**
+ * @return If we have an alert
+ */
+ public static native boolean HasAlertMsg();
+
+ /**
+ * @return The alert string
+ */
+ public static native String GetAlertMsg();
+
+ /**
+ * Clears event in the JNI so we can continue onward
+ */
+ public static native void ClearAlertMsg();
+
/** Native EGL functions not exposed by Java bindings **/
public static native void eglBindAPI(int api);