Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b8b417c authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "When updating existing entries in the media database, don't update the... 

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: I56761240d6f6e699514169d80a445317ba0de9e2" into froyo
parents 3891c4cc c0665573

media/java/android/media/MediaScanner.java

+6 −2
Original line number Diff line number Diff line
@@ -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_NOTIFICATION, notifications);

                values.put(Audio.Media.IS_ALARM, alarms);
@@ -764,7 +769,6 @@ public class MediaScanner 
            }



            Uri result = null;

            long rowId = entry.mRowId;

            if (rowId == 0) {

                // new file, insert it

                result = mMediaProvider.insert(tableUri, values);