From 0dd9f4de3ed681e83bd79ddcd4fd463093d11ed3 Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Wed, 12 Jan 2011 15:52:41 -0500 Subject: [PATCH] MediaScanner: Do not update the file path when updating records already in the database The path should never change (media scanner treats renames as a delete and an insert) and we want to preserve the mixed case paths in the database to avoid exposing the lowercase squashing to MTP. Change-Id: I79ef37e143c607242d438a4a0643d40191965b6a Signed-off-by: Mike Lockwood --- media/java/android/media/MediaScanner.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java index d5fc1d367843f..37086236290b8 100644 --- a/media/java/android/media/MediaScanner.java +++ b/media/java/android/media/MediaScanner.java @@ -784,6 +784,9 @@ public class MediaScanner } else { // updated file result = ContentUris.withAppendedId(tableUri, rowId); + // path should never change, and we want to avoid replacing mixed cased paths + // with squashed lower case paths + values.remove(MediaStore.MediaColumns.DATA); mMediaProvider.update(result, values, null, null); } if (mProcessGenres && mGenre != null) {