commit 4ad4b8603cc0af86424e3224f683a35c96f88d21
author Mike Lockwood <lockwood@google.com> Tue Sep 18 13:34:57 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 18 13:34:57 2012 -0700
tree 1087fec9d4d085def2fa4f4cf955b248a1fc2a49
parent 7e3afafd1bf57a071fafcd0a99819597884c16f0
parent 704fe6bc9da64c3d99db9b5a40705419aa091ce4

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

* commit '704fe6bc9da64c3d99db9b5a40705419aa091ce4':
  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