diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-11-21 01:52:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-11-21 01:52:23 +0000 |
| commit | f8c36914250a2274ce20102b350915cd6ffaa6eb (patch) | |
| tree | 89cf0a752879d01c8ad5b5b607612314092a9c6f /core/java/android/provider | |
| parent | 51041cb7daa74971b6aff1a1370fbb4859902112 (diff) | |
| parent | 377d6f00dc2ab42df501fd12b23e1dab54cea6b7 (diff) | |
| download | frameworks_base-f8c36914250a2274ce20102b350915cd6ffaa6eb.zip frameworks_base-f8c36914250a2274ce20102b350915cd6ffaa6eb.tar.gz frameworks_base-f8c36914250a2274ce20102b350915cd6ffaa6eb.tar.bz2 | |
am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev
automerge: 377d6f0
* commit '377d6f00dc2ab42df501fd12b23e1dab54cea6b7':
Fix issue with call backs from media process.
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/DocumentsProvider.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/provider/DocumentsProvider.java b/core/java/android/provider/DocumentsProvider.java index 932e873..1316471 100644 --- a/core/java/android/provider/DocumentsProvider.java +++ b/core/java/android/provider/DocumentsProvider.java @@ -637,7 +637,7 @@ public abstract class DocumentsProvider extends ContentProvider { final Bundle out = new Bundle(); try { if (METHOD_CREATE_DOCUMENT.equals(method)) { - enforceWritePermissionInner(documentUri); + enforceWritePermissionInner(documentUri, null); final String mimeType = extras.getString(Document.COLUMN_MIME_TYPE); final String displayName = extras.getString(Document.COLUMN_DISPLAY_NAME); @@ -651,7 +651,7 @@ public abstract class DocumentsProvider extends ContentProvider { out.putParcelable(DocumentsContract.EXTRA_URI, newDocumentUri); } else if (METHOD_RENAME_DOCUMENT.equals(method)) { - enforceWritePermissionInner(documentUri); + enforceWritePermissionInner(documentUri, null); final String displayName = extras.getString(Document.COLUMN_DISPLAY_NAME); final String newDocumentId = renameDocument(documentId, displayName); @@ -675,7 +675,7 @@ public abstract class DocumentsProvider extends ContentProvider { } } else if (METHOD_DELETE_DOCUMENT.equals(method)) { - enforceWritePermissionInner(documentUri); + enforceWritePermissionInner(documentUri, null); deleteDocument(documentId); // Document no longer exists, clean up any grants |