Android: Make the handling of SAF open modes more robust

1 files changed, 3 insertions, 1 deletions

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/ContentHandler.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/ContentHandler.java
index 83b9c585c9..dc4472a212 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/ContentHandler.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/ContentHandler.java
@@ -17,7 +17,9 @@ public class ContentHandler
       return DolphinApplication.getAppContext().getContentResolver()
               .openFileDescriptor(Uri.parse(uri), mode).detachFd();
     }
-    catch (FileNotFoundException | NullPointerException e)
+    // Some content providers throw IllegalArgumentException for invalid modes,
+    // despite the documentation saying that invalid modes result in a FileNotFoundException
+    catch (FileNotFoundException | IllegalArgumentException | NullPointerException e)
     {
       return -1;
     }