瀏覽代碼

Fix inappropriate fd usage.

Miku AuahDark 3 年之前
父節點
當前提交
24778126d6
共有 2 個文件被更改,包括 3 次插入2 次删除
  1. 1 0
      app/build.gradle
  2. 2 2
      app/src/main/java/org/love2d/android/GameActivity.java

+ 1 - 0
app/build.gradle

@@ -83,4 +83,5 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation 'androidx.navigation:navigation-fragment:2.3.5'
     implementation 'androidx.navigation:navigation-fragment:2.3.5'
     implementation 'androidx.navigation:navigation-ui:2.3.5'
     implementation 'androidx.navigation:navigation-ui:2.3.5'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
 }
 }

+ 2 - 2
app/src/main/java/org/love2d/android/GameActivity.java

@@ -375,8 +375,8 @@ public class GameActivity extends SDLActivity {
     private int convertToFileDescriptor(Uri uri) {
     private int convertToFileDescriptor(Uri uri) {
         try {
         try {
             ParcelFileDescriptor pfd = getContentResolver().openFileDescriptor(uri, "r");
             ParcelFileDescriptor pfd = getContentResolver().openFileDescriptor(uri, "r");
-            return pfd.getFd();
-        } catch (FileNotFoundException e) {
+            return pfd.dup().detachFd();
+        } catch (IOException e) {
             Log.d(TAG, "Failed attempt to convert " + uri.toString() + " to file descriptor", e);
             Log.d(TAG, "Failed attempt to convert " + uri.toString() + " to file descriptor", e);
         }
         }