commit 3750847861dd817fe5a3ec3d5d7ac0bb6e3d5016
author android-build-team Robot <android-build-team-robot@google.com> Fri May 03 09:20:03 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri May 03 09:20:03 2019 +0000
tree f76fc64a5a7d430650b2d289004e1a47be17ff35
parent 2c3e8e6bb598ac65fd3dfe9a3f3ea2c8f1f017d5
parent 99586b04120ea4994712f1494919e84f1f345f56

Snap for 5526913 from 99586b04120ea4994712f1494919e84f1f345f56 to pi-qpr3-b-release

Change-Id: Ib6f9e9a8925c085b50586220fe865802eda1d519

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 8f3b54b..6f8598b 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -4056,6 +4056,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);