commit f46fae3e7e5b1493b6e0ec54563ba05d80d5cc0f
author Mike Lockwood <lockwood@google.com> Tue Sep 18 13:40:35 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 18 13:40:35 2012 -0700
tree ff2de40cf642c24d15fe027218b6cc3ed9d81820
parent 7e0851411d4450634e8e91acad810a3931a5db87
parent 4ad4b8603cc0af86424e3224f683a35c96f88d21

am 4ad4b860: am 704fe6bc: Make sure file paths are canonical in scanFile()

* commit '4ad4b8603cc0af86424e3224f683a35c96f88d21':
  Make sure file paths are canonical in scanFile()

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

diff --git a/src/com/android/providers/media/MediaScannerService.java b/src/com/android/providers/media/MediaScannerService.java
index 46e5b2e..40bb10a 100644
--- a/src/com/android/providers/media/MediaScannerService.java
+++ b/src/com/android/providers/media/MediaScannerService.java
@@ -190,7 +190,14 @@
         String volumeName = MediaProvider.EXTERNAL_VOLUME;
         openDatabase(volumeName);
         MediaScanner scanner = createMediaScanner();
-        return scanner.scanSingleFile(path, volumeName, mimeType);
+        try {
+            // make sure the file path is in canonical form
+            String canonicalPath = new File(path).getCanonicalPath();
+            return scanner.scanSingleFile(canonicalPath, volumeName, mimeType);
+        } catch (Exception e) {
+            Log.e(TAG, "bad path " + path + " in scanFile()", e);
+            return null;
+        }
     }
 
     @Override