commit 6d1fac3dfb0ed1b01baaad21b320e8b2c518cd27
author Jeff Sharkey <jsharkey@android.com> Wed Sep 19 11:22:31 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 19 11:22:31 2012 -0700
tree be2621538d50fd93c61804112d078ffa17313548
parent f58f4b9517220a8672b262ab2a83b52fd1fdebab
parent 8bd4260d1b6c02252130f8c319ca6f4c3aed6297

Merge "Update buckets after path changes." into jb-mr1-dev

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