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

Merge "Revoke the uri permission when the file is deleted" into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-12-03 08:05:44 +00:00
committed by Android (Google) Code Review
parent 79062d7903 42c44f3601
commit 9064940495
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));