commit 8b3c10ac4388f30894ac5bbac28f7c95424ab5dc
author Jeff Sharkey <jsharkey@google.com> Wed Nov 13 22:20:58 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 13 22:20:58 2019 +0000
tree 29765add24d960d81e74e551b62234182fb466cc
parent b30bf806954d290d3804ce7b1a597d4f7aad62fa
parent 10b373b512ed1bbd1ddabd90a165b7f8c5e3d33c

Merge "Canonicalize path before scanning."

media/java/android/media/MediaScannerConnection.java

diff --git a/media/java/android/media/MediaScannerConnection.java b/media/java/android/media/MediaScannerConnection.java
index 7eec8d9..8d85724 100644
--- a/media/java/android/media/MediaScannerConnection.java
+++ b/media/java/android/media/MediaScannerConnection.java
@@ -197,7 +197,7 @@
     private static Uri scanFileQuietly(ContentProviderClient client, File file) {
         Uri uri = null;
         try {
-            uri = MediaStore.scanFile(client, file);
+            uri = MediaStore.scanFile(client, file.getCanonicalFile());
             Log.d(TAG, "Scanned " + file + " to " + uri);
         } catch (Exception e) {
             Log.w(TAG, "Failed to scan " + file + ": " + e);