Revert "[automerge] Modify Media provider such that app-shared p..."
Revert submission 22433548-presubmit-am-08d101facaf74e39ae65638c6d086f0e
Reason for revert: dead code path change isn't needed
Reverted changes: /q/submissionid:22433548-presubmit-am-08d101facaf74e39ae65638c6d086f0e
Change-Id: I77f090eb00a80ea250dfefd852a3664bd22f96d1
diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index 5eb59cd..b16e0b6 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -3322,18 +3322,11 @@
}
if (isPickerUri(uri)) {
- // If the Uri for which the permission needs to be checked is a picker Uri then query
- // PickerUriResolver and verify if the data represented by the Uri still exists and is
- // accessible then grant the permission, else deny it.
- // TODO(b/276948648): Remove flag once changes are tested and verified.
- if (mConfigStore.isGetContentTakeOverEnabled()) {
- try (Cursor c = mPickerUriResolver.query(uri, new String[]{BaseColumns._ID},
- mCallingIdentity.get().pid, uid, mCallingIdentity.get().getPackageName())) {
- if (c != null && c.getCount() == 1) {
- return PackageManager.PERMISSION_GRANTED;
- }
- }
- }
+ // Do not allow implicit access (by the virtue of ownership/permission) to picker uris.
+ // Picker uris should have explicit permission grants.
+ // If the calling app A has an explicit grant on picker uri, UriGrantsManagerService
+ // will check the grant status and allow app A to grant the uri to app B (without
+ // calling into MediaProvider)
return PackageManager.PERMISSION_DENIED;
}
