diff options
| author | 2022-01-13 15:43:38 +0000 | |
|---|---|---|
| committer | 2022-02-21 11:29:52 +0000 | |
| commit | 4fd99fd4aff341e5f4d3975e6a7bedfac76d99f7 (patch) | |
| tree | 5a74dc24b529968b93bb3bddb56505cb02579f18 /proguard.flags | |
| parent | 57758b43515a5542ca07837df8cb7b513983f5a4 (diff) | |
Fix unnecessary redaction for videos in DCIM/Camera
The MediaMetadataRetriever (MMR) attempts to convert any legacy fds
obtained from a modern fd back to a modern fd. Access control is
implemented in the FuseDaemon by checking if the caller has an fd from
the FUSE fs and if so, it simply re-opens the associated file path and
returns the original (modern) fd to the caller.
The previous implementation was conservative and always opened a
redacted fd if an equivalent fd was found on the FUSE fs.
This breaks MMR location metadata access because location will always
be redacted when the data source is a file path or fd because the FUSE
fs will have an equivalent fd by the time convertToModernFd is called.
Now, we retrieve the redaction state of the equivalent opened FUSE fd
and use that to open the returned modern fd.
Test: atest TranscodeTest && atest fuse_node_test
Bug: 205749245
Change-Id: I45670dff4e5348a3b07bf423cd1465c328ad79ea
Diffstat (limited to 'proguard.flags')
| -rw-r--r-- | proguard.flags | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/proguard.flags b/proguard.flags index 30aa201b3..aa234cca2 100644 --- a/proguard.flags +++ b/proguard.flags @@ -13,6 +13,7 @@ -keep public class com.android.providers.media.photopicker.PhotoPickerProvider -keep public final class com.android.providers.media.FileLookupResult { *; } -keep public final class com.android.providers.media.FileOpenResult { *; } +-keep public final class com.android.providers.media.FdAccessResult { *; } -keep public class * implements com.bumptech.glide.module.GlideModule -keep class * extends com.bumptech.glide.module.AppGlideModule { <init>(...); |