Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revoke the uri permission when the file is deleted

Browse Source 
When the file is deleted, renamed or moved, revoke all uri
permissions with the file

Bug: 157474195
Test: manual test with DocumentsUI
Test: atest DocumentsTest#testAfterMoveDocumentInStorage_revokeUriPermission
Change-Id: I4ffb183630aadb2d87b0965e8cecf88af15f4534
Merged-In: I4ffb183630aadb2d87b0965e8cecf88af15f4534
(cherry picked from commit 9efd606f43)
This commit is contained in:
Ivan Chiang
2020-08-10 16:43:33 +08:00
parent 78c2d2ca94
commit 42c44f3601
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/com/android/internal/content/FileSystemProvider.java
View File

@@ -87,6 +87,14 @@ public abstract class FileSystemProvider extends DocumentsProvider {
protected abstract Uri buildNotificationUri(String docId); protected abstract Uri buildNotificationUri(String docId);
/**
* Callback indicating that the given document has been deleted or moved. This gives
* the provider a hook to revoke the uri permissions.
*/
protected void onDocIdDeleted(String docId) {
// Default is no-op
}
@Override @Override
public boolean onCreate() { public boolean onCreate() {
throw new UnsupportedOperationException( throw new UnsupportedOperationException(
@@ -221,6 +229,7 @@ public abstract class FileSystemProvider extends DocumentsProvider {
} }
final String afterDocId = getDocIdForFile(after); final String afterDocId = getDocIdForFile(after);
onDocIdDeleted(docId);
moveInMediaStore(visibleFileBefore, getFileForDocId(afterDocId, true)); moveInMediaStore(visibleFileBefore, getFileForDocId(afterDocId, true));
if (!TextUtils.equals(docId, afterDocId)) { if (!TextUtils.equals(docId, afterDocId)) {
@@ -246,6 +255,7 @@ public abstract class FileSystemProvider extends DocumentsProvider {
} }
final String docId = getDocIdForFile(after); final String docId = getDocIdForFile(after);
onDocIdDeleted(sourceDocumentId);
moveInMediaStore(visibleFileBefore, getFileForDocId(docId, true)); moveInMediaStore(visibleFileBefore, getFileForDocId(docId, true));
return docId; return docId;
@@ -295,6 +305,7 @@ public abstract class FileSystemProvider extends DocumentsProvider {
throw new IllegalStateException("Failed to delete " + file); throw new IllegalStateException("Failed to delete " + file);
} }
onDocIdDeleted(docId);
removeFromMediaStore(visibleFile, isDirectory); removeFromMediaStore(visibleFile, isDirectory);
} }

6
packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
View File

@@ -384,6 +384,12 @@ public class ExternalStorageProvider extends FileSystemProvider {
return DocumentsContract.buildChildDocumentsUri(AUTHORITY, docId); return DocumentsContract.buildChildDocumentsUri(AUTHORITY, docId);
} }
@Override
protected void onDocIdDeleted(String docId) {
Uri uri = DocumentsContract.buildDocumentUri(AUTHORITY, docId);
getContext().revokeUriPermission(uri, ~0);
}
@Override @Override
public Cursor queryRoots(String[] projection) throws FileNotFoundException { public Cursor queryRoots(String[] projection) throws FileNotFoundException {
final MatrixCursor result = new MatrixCursor(resolveRootProjection(projection)); final MatrixCursor result = new MatrixCursor(resolveRootProjection(projection));