Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9d14e3ea: am 9b8b417c: Merge "When updating existing entries in the media database, don\'t update the is_music, is_ringtone, etc columns. This ensures that custom ringtones will still be shown in the ringtone picker after a rescan. Bug 2594125 Change-Id: I56761240d

Browse Source 
Merge commit '9d14e3ea22f48173070789951ee6dc64b507e13f' into kraken

* commit '9d14e3ea22f48173070789951ee6dc64b507e13f':
  When updating existing entries in the media database, don't update
This commit is contained in:
Marco Nelissen
2010-04-20 11:33:21 -07:00
committed by Android Git Automerger
parent 5b550c9efc 9d14e3ea22
commit fe13eebee9
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media/java/android/media/MediaScanner.java
View File

@@ -714,7 +714,12 @@ public class MediaScanner
} }
} }
} }
if (isAudio) { long rowId = entry.mRowId;
if (isAudio && rowId == 0) {
// Only set these for new entries. For existing entries, they
// may have been modified later, and we want to keep the current
// values so that custom ringtones still show up in the ringtone
// picker.
values.put(Audio.Media.IS_RINGTONE, ringtones); values.put(Audio.Media.IS_RINGTONE, ringtones);
values.put(Audio.Media.IS_NOTIFICATION, notifications); values.put(Audio.Media.IS_NOTIFICATION, notifications);
values.put(Audio.Media.IS_ALARM, alarms); values.put(Audio.Media.IS_ALARM, alarms);
@@ -764,7 +769,6 @@ public class MediaScanner
} }
Uri result = null; Uri result = null;
long rowId = entry.mRowId;
if (rowId == 0) { if (rowId == 0) {
// new file, insert it // new file, insert it
result = mMediaProvider.insert(tableUri, values); result = mMediaProvider.insert(tableUri, values);