summaryrefslogtreecommitdiff
path: root/Source/Android/app/src/main/java
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@gmail.com>2015-05-25 23:37:48 -0400
committerRyan Houdek <Sonicadvance1@gmail.com>2015-05-25 23:37:48 -0400
commitc88d6c804a0e878ce917164dd90face01e89f927 (patch)
tree9a8727b11f6886bb3eb348564e454c4f07692119 /Source/Android/app/src/main/java
parent4ba430951a87c1831c7dcaa92d7dd3c9b859e098 (diff)
parentd789d8d75fda89d68a75e2ce605f082f379b8cfe (diff)
Merge pull request #2430 from Sonicadvance1/android_panic_handler
[Android] Add support for panic alerts to the JNI.
Diffstat (limited to 'Source/Android/app/src/main/java')
-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);