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 rvc-dev am: ac411bea0e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12455468

Change-Id: I93aff30932b836e8e22c0dd5f03a392707832131
This commit is contained in:
TreeHugger Robot
2020-12-03 07:07:37 +00:00
committed by Automerger Merge Worker
parent 68a96d3333 ac411bea0e
commit cf89d25153
2 changed files with 18 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

@@ -113,6 +113,14 @@ public abstract class FileSystemProvider extends DocumentsProvider {
// Default is no-op // Default is no-op
} }
/**
* 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(
@@ -283,6 +291,7 @@ public abstract class FileSystemProvider extends DocumentsProvider {
final String afterDocId = getDocIdForFile(after); final String afterDocId = getDocIdForFile(after);
onDocIdChanged(docId); onDocIdChanged(docId);
onDocIdDeleted(docId);
onDocIdChanged(afterDocId); onDocIdChanged(afterDocId);
final File afterVisibleFile = getFileForDocId(afterDocId, true); final File afterVisibleFile = getFileForDocId(afterDocId, true);
@@ -312,6 +321,7 @@ public abstract class FileSystemProvider extends DocumentsProvider {
final String docId = getDocIdForFile(after); final String docId = getDocIdForFile(after);
onDocIdChanged(sourceDocumentId); onDocIdChanged(sourceDocumentId);
onDocIdDeleted(sourceDocumentId);
onDocIdChanged(docId); onDocIdChanged(docId);
moveInMediaStore(visibleFileBefore, getFileForDocId(docId, true)); moveInMediaStore(visibleFileBefore, getFileForDocId(docId, true));
@@ -343,6 +353,7 @@ public abstract class FileSystemProvider extends DocumentsProvider {
} }
onDocIdChanged(docId); onDocIdChanged(docId);
onDocIdDeleted(docId);
removeFromMediaStore(visibleFile); removeFromMediaStore(visibleFile);
} }

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

@@ -482,6 +482,13 @@ public class ExternalStorageProvider extends FileSystemProvider {
} }
} }
@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));