diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-01-12 15:52:41 -0500 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2011-01-12 17:27:37 -0500 |
| commit | 0dd9f4de3ed681e83bd79ddcd4fd463093d11ed3 (patch) | |
| tree | 1aef704f7d9469f5e3f9c9a0f0d6eec8409e2f30 /media/java | |
| parent | a29464335a1d164fde0817715d86ba6224d0a61f (diff) | |
| download | frameworks_base-0dd9f4de3ed681e83bd79ddcd4fd463093d11ed3.zip frameworks_base-0dd9f4de3ed681e83bd79ddcd4fd463093d11ed3.tar.gz frameworks_base-0dd9f4de3ed681e83bd79ddcd4fd463093d11ed3.tar.bz2 | |
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 <lockwood@android.com>
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/MediaScanner.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java index d5fc1d3..3708623 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) { |