Merge "Translate SecurityException into EACCES."

2019-02-28 00:19:05 +00:00
parent 3a834cb813 b50f51e604
commit 4020f8c038
1 changed files with 2 additions and 0 deletions
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -6954,6 +6954,8 @@ public final class ActivityThread extends ClientTransactionHandler {
                fd.setInt$(cr.openFileDescriptor(uri,
                        FileUtils.translateModePosixToString(mode)).detachFd());
                return fd;
+            } catch (SecurityException e) {
+                throw new ErrnoException(e.getMessage(), OsConstants.EACCES);
            } catch (FileNotFoundException e) {
                throw new ErrnoException(e.getMessage(), OsConstants.ENOENT);
            }