commit 23f153803512e4a40b274f78f57fab1c16feb555
author Mike Lockwood <lockwood@android.com> Thu Dec 02 07:38:37 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 02 07:38:37 2010 -0800
tree 493bdbbc9c5d04a5d6338ab832be4ae62951be4b
parent f474e38287edfdc2b683e1e9103fd785ad533c15
parent f45853af5051df4abaa33cdca7fa986104811d1a

Merge "MediaScanner: Fix path mismatch in code that check for missing files in postScan()"

media/java/android/media/MediaScanner.java

diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
index 69b872b..e17a640 100644
--- a/media/java/android/media/MediaScanner.java
+++ b/media/java/android/media/MediaScanner.java
@@ -992,7 +992,12 @@
 
     private boolean inScanDirectory(String path, String[] directories) {
         for (int i = 0; i < directories.length; i++) {
-            if (path.startsWith(directories[i])) {
+            String directory = directories[i];
+            if (mExternalStoragePath != null && directory.equals(mMediaStoragePath)) {
+                // database paths use external storage prefix
+                directory = mExternalStoragePath;
+            }
+            if (path.startsWith(directory)) {
                 return true;
             }
         }