diff options
| author | Marco Nelissen <marcone@google.com> | 2009-04-22 10:34:12 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2009-04-22 10:34:12 -0700 |
| commit | 9f0b1a48506af8e18162f62570561135b65a4ed1 (patch) | |
| tree | 1b332f387672887dc43b3cd89da1567e8a8888bf /media/java | |
| parent | c9a3b66d27c211ed0dc03424305ae4b3b48ad8e8 (diff) | |
| download | frameworks_base-9f0b1a48506af8e18162f62570561135b65a4ed1.zip frameworks_base-9f0b1a48506af8e18162f62570561135b65a4ed1.tar.gz frameworks_base-9f0b1a48506af8e18162f62570561135b65a4ed1.tar.bz2 | |
Do case-insensitive matching when determining whether something is music, an alarm sound, notification sound, etc.
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/MediaScanner.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java index fc8476d..ae3e181 100644 --- a/media/java/android/media/MediaScanner.java +++ b/media/java/android/media/MediaScanner.java @@ -453,11 +453,12 @@ public class MediaScanner FileCacheEntry entry = beginFile(path, mimeType, lastModified, fileSize); // rescan for metadata if file was modified since last scan if (entry != null && (entry.mLastModifiedChanged || scanAlways)) { - boolean ringtones = (path.indexOf(RINGTONES_DIR) > 0); - boolean notifications = (path.indexOf(NOTIFICATIONS_DIR) > 0); - boolean alarms = (path.indexOf(ALARMS_DIR) > 0); - boolean podcasts = (path.indexOf(PODCAST_DIR) > 0); - boolean music = (path.indexOf(MUSIC_DIR) > 0) || + String lowpath = path.toLowerCase(); + boolean ringtones = (lowpath.indexOf(RINGTONES_DIR) > 0); + boolean notifications = (lowpath.indexOf(NOTIFICATIONS_DIR) > 0); + boolean alarms = (lowpath.indexOf(ALARMS_DIR) > 0); + boolean podcasts = (lowpath.indexOf(PODCAST_DIR) > 0); + boolean music = (lowpath.indexOf(MUSIC_DIR) > 0) || (!ringtones && !notifications && !alarms && !podcasts); if (mFileType == MediaFile.FILE_TYPE_MP3 || |