Merge pull request #8902 from JosJuice/android-convert

Android: Add disc image conversion

1 files changed, 25 insertions, 0 deletions

diff --git a/Source/Android/jni/AndroidCommon/AndroidCommon.cpp b/Source/Android/jni/AndroidCommon/AndroidCommon.cpp
index 1f9973d451..73405b6d8e 100644
--- a/Source/Android/jni/AndroidCommon/AndroidCommon.cpp
+++ b/Source/Android/jni/AndroidCommon/AndroidCommon.cpp
@@ -11,6 +11,7 @@
 #include <jni.h>
 
 #include "Common/StringUtil.h"
+#include "jni/AndroidCommon/IDCache.h"
 
 std::string GetJString(JNIEnv* env, jstring jstr)
 {
@@ -40,3 +41,27 @@ std::vector<std::string> JStringArrayToVector(JNIEnv* env, jobjectArray array)
 
   return result;
 }
+
+int OpenAndroidContent(const std::string& uri, const std::string& mode)
+{
+  JNIEnv* env = IDCache::GetEnvForThread();
+  const jint fd = env->CallStaticIntMethod(IDCache::GetContentHandlerClass(),
+                                           IDCache::GetContentHandlerOpenFd(), ToJString(env, uri),
+                                           ToJString(env, mode));
+
+  // We can get an IllegalArgumentException when passing an invalid mode
+  if (env->ExceptionCheck())
+  {
+    env->ExceptionDescribe();
+    abort();
+  }
+
+  return fd;
+}
+
+bool DeleteAndroidContent(const std::string& uri)
+{
+  JNIEnv* env = IDCache::GetEnvForThread();
+  return env->CallStaticBooleanMethod(IDCache::GetContentHandlerClass(),
+                                      IDCache::GetContentHandlerDelete(), ToJString(env, uri));
+}