commit a0d9a63f1d16eba887d78a2286d8ac6f3c397909
author Jeff Sharkey <jsharkey@android.com> Sat Jul 25 10:39:54 2015 -0700
committer Jeff Sharkey <jsharkey@android.com> Sat Jul 25 10:40:27 2015 -0700
tree 52508e5324b4d0ae4f800d03bce8814afbc260de
parent 5893c2091a2f8102c49e11c5a11528adf08a90a0

Follow refactoring when enforcing permissions.

Change-Id: I3fd245622a7f1183cbe21e61f7604c8195022e69

core/java/android/provider/DocumentsProvider.java

diff --git a/core/java/android/provider/DocumentsProvider.java b/core/java/android/provider/DocumentsProvider.java
index 61bb01a..28ac165 100644
--- a/core/java/android/provider/DocumentsProvider.java
+++ b/core/java/android/provider/DocumentsProvider.java
@@ -726,8 +726,8 @@
                 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 @@
                 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);