summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media/java/android/media/MediaScanner.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
index 69b872b68478..e17a640d33d2 100644
--- a/media/java/android/media/MediaScanner.java
+++ b/media/java/android/media/MediaScanner.java
@@ -992,7 +992,12 @@ public class MediaScanner
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;
}
}