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

Commit a0d9a63f authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Follow refactoring when enforcing permissions. 

Change-Id: I3fd245622a7f1183cbe21e61f7604c8195022e69
parent 5893c209

core/java/android/provider/DocumentsProvider.java

+4 −4
Original line number Diff line number Diff line
@@ -726,8 +726,8 @@ public abstract class DocumentsProvider extends ContentProvider { 
                final Uri targetUri = extras.getParcelable(DocumentsContract.EXTRA_TARGET_URI);

                final String targetId = DocumentsContract.getDocumentId(targetUri);



                enforceReadPermissionInner(documentUri, null);

                enforceWritePermissionInner(targetUri, null);

                enforceReadPermissionInner(documentUri, getCallingPackage(), null);

                enforceWritePermissionInner(targetUri, getCallingPackage(), null);



                final String newDocumentId = copyDocument(documentId, targetId);
@@ -748,8 +748,8 @@ public abstract class DocumentsProvider extends ContentProvider { 
                final Uri targetUri = extras.getParcelable(DocumentsContract.EXTRA_TARGET_URI);

                final String targetId = DocumentsContract.getDocumentId(targetUri);



                enforceReadPermissionInner(documentUri, null);

                enforceWritePermissionInner(targetUri, null);

                enforceReadPermissionInner(documentUri, getCallingPackage(), null);

                enforceWritePermissionInner(targetUri, getCallingPackage(), null);



                final String displayName = extras.getString(Document.COLUMN_DISPLAY_NAME);

                final String newDocumentId = moveDocument(documentId, targetId);