diff --git a/app/src/main/cpp/love b/app/src/main/cpp/love index 44e26a12..bff50070 160000 --- a/app/src/main/cpp/love +++ b/app/src/main/cpp/love @@ -1 +1 @@ -Subproject commit 44e26a12cdd159aa35c863be91279cd2b2e062d0 +Subproject commit bff50070c62c54abb61dbc3dd60613f2f4f943ac diff --git a/app/src/main/java/org/love2d/android/GameActivity.java b/app/src/main/java/org/love2d/android/GameActivity.java index 312b53d8..d332558f 100644 --- a/app/src/main/java/org/love2d/android/GameActivity.java +++ b/app/src/main/java/org/love2d/android/GameActivity.java @@ -30,7 +30,6 @@ import android.media.AudioManager; import android.net.Uri; import android.os.Bundle; -import android.os.ParcelFileDescriptor; import android.os.VibrationEffect; import android.os.Vibrator; import android.util.DisplayMetrics; @@ -324,11 +323,6 @@ public void requestRecordAudioPermission() { } } - @Keep - public int convertToFileDescriptor(String uri) { - return convertToFileDescriptor(Uri.parse(uri)); - } - public int getAudioSMP() { int smp = 256; AudioManager a = (AudioManager) getSystemService(Context.AUDIO_SERVICE); @@ -354,12 +348,8 @@ public int getAudioFreq() { } public boolean isNativeLibsExtracted() { - if (android.os.Build.VERSION.SDK_INT >= 23) { - ApplicationInfo appInfo = getApplicationInfo(); - return (appInfo.flags & ApplicationInfo.FLAG_EXTRACT_NATIVE_LIBS) != 0; - } - - return false; + ApplicationInfo appInfo = getApplicationInfo(); + return (appInfo.flags & ApplicationInfo.FLAG_EXTRACT_NATIVE_LIBS) != 0; } public void sendUriAsDroppedFile(Uri uri) { @@ -426,32 +416,14 @@ private HashMap buildFileTree(AssetManager assetManager, String return map; } - private int convertToFileDescriptor(Uri uri) { - int fd = -1; - - try { - ParcelFileDescriptor pfd = getContentResolver().openFileDescriptor(uri, "r"); - if (pfd == null) { - throw new RuntimeException("pfd is null"); - } - - fd = pfd.dup().detachFd(); - pfd.close(); - } catch (Exception e) { - Log.e(TAG, "Failed attempt to convert " + uri.toString() + " to file descriptor", e); - } - - return fd; - } - private void processOpenGame(Uri game) { String scheme = game.getScheme(); String path = game.getPath(); if (scheme != null) { if (scheme.equals("content")) { - // Convert the URI to file descriptor. - args = new String[]{"love2d://fd/" + convertToFileDescriptor(game)}; + // Pass content URI as-is. + args = new String[]{game.toString()}; } else if (scheme.equals("file")) { // Regular file, pass as-is. args = new String[]{path};