Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2e929e1 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Geremy Condra
Browse files

Tighten enforcement of file modes. 

Bug: 8275867
Change-Id: I4da14f2dd0049aca69636999696c1f3c02b3b792
parent c84b3603

core/java/android/content/ContentProvider.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -238,7 +238,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 { 
        @Override

        @Override

        public ParcelFileDescriptor openFile(Uri uri, String mode)

        public ParcelFileDescriptor openFile(Uri uri, String mode)

                throws FileNotFoundException {

                throws FileNotFoundException {

            if (mode != null && mode.startsWith("rw")) enforceWritePermission(uri);

            if (mode != null && mode.indexOf('w') != -1) enforceWritePermission(uri);

            else enforceReadPermission(uri);

            else enforceReadPermission(uri);

            return ContentProvider.this.openFile(uri, mode);

            return ContentProvider.this.openFile(uri, mode);

        }

        }
@@ -246,7 +246,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 { 
        @Override

        @Override

        public AssetFileDescriptor openAssetFile(Uri uri, String mode)

        public AssetFileDescriptor openAssetFile(Uri uri, String mode)

                throws FileNotFoundException {

                throws FileNotFoundException {

            if (mode != null && mode.startsWith("rw")) enforceWritePermission(uri);

            if (mode != null && mode.indexOf('w') != -1) enforceWritePermission(uri);

            else enforceReadPermission(uri);

            else enforceReadPermission(uri);

            return ContentProvider.this.openAssetFile(uri, mode);

            return ContentProvider.this.openAssetFile(uri, mode);

        }

        }