commit bc4db5fae58cb8bae37ed466f0a9c4f8b58a0ac1
author Xin Li <delphij@google.com> Tue Jul 09 11:24:34 2019 -0700
committer Xin Li <delphij@google.com> Tue Jul 09 11:24:34 2019 -0700
tree a85cce083e02eae8eaa0b8705fa4bb5dec55b4ea
parent 028622587af588a94df83d9065693074b66a05f6
parent f5e8f5b0d53e672955d2ec721c0c83162d61db5d

DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master

Bug: 136196576
Change-Id: I105b12726cc94bb55ff1968082167ee8c35cac64

src/com/android/providers/media/MediaProvider.java

diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index 5690b3c..122531c 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -4060,6 +4060,11 @@
         final int modeBits = ParcelFileDescriptor.parseMode(mode);
 
         File file = queryForDataFile(uri);
+        try {
+            file = file.getCanonicalFile();
+        } catch (IOException e) {
+            throw new FileNotFoundException("Failed to get cannonical path for " + uri);
+        }
 
         checkAccess(uri, file, modeBits);