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

Commit 1d149af0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Fix no ringtone and notification sound after MediaScan"

parents 75b27161 b7ac686c

media/java/android/media/MediaScanner.java

+23 −10
Original line number Original line Diff line number Diff line
@@ -1001,9 +1001,13 @@ public class MediaScanner 
                // notifications, ringtones, and alarms, because the rowId of the inserted file is

                // notifications, ringtones, and alarms, because the rowId of the inserted file is

                // needed.

                // needed.

                if (mWasEmptyPriorToScan) {

                if (mWasEmptyPriorToScan) {

                    needToSetSettings = needToSetSettingsForNotification(entry)

                    if (notifications && !mDefaultNotificationSet) {

                            || needToSetSettingsForRingtone(entry)

                        needToSetSettings = needToSetSettingsForNotification(entry);

                            || needToSetSettingsForAlarm(entry);

                    } else if (ringtones && !mDefaultRingtoneSet) {

                        needToSetSettings = needToSetSettingsForRingtone(entry);

                    } else if (alarms && !mDefaultAlarmSet) {

                        needToSetSettings = needToSetSettingsForAlarm(entry);

                    }

                }

                }





                // New file, insert it.

                // New file, insert it.
@@ -1081,17 +1085,26 @@ public class MediaScanner 
        }

        }





        private boolean needToSetSettingsForNotification(FileEntry entry) {

        private boolean needToSetSettingsForNotification(FileEntry entry) {

            return TextUtils.isEmpty(mDefaultNotificationFilename)

            boolean result = TextUtils.isEmpty(mDefaultNotificationFilename)

                    || doesPathHaveFilename(entry.mPath, mDefaultNotificationFilename)

                    || doesPathHaveFilename(entry.mPath, mDefaultNotificationFilename);

            if (isSoundCustomized()) {

                result = result || TextUtils.isEmpty(mDefaultMmsNotificationFilename)

                        || doesPathHaveFilename(entry.mPath, mDefaultMmsNotificationFilename);

                        || doesPathHaveFilename(entry.mPath, mDefaultMmsNotificationFilename);

            }

            }

            return result;

        }





        private boolean needToSetSettingsForRingtone(FileEntry entry) {

        private boolean needToSetSettingsForRingtone(FileEntry entry) {

            return TextUtils.isEmpty(mDefaultRingtoneFilename)

            boolean result = TextUtils.isEmpty(mDefaultRingtoneFilename)

                    || doesPathHaveFilename(entry.mPath, mDefaultRingtoneFilename)

                    || doesPathHaveFilename(entry.mPath, mDefaultRingtoneFilename);

            if (isSoundCustomized()) {

                result = result || TextUtils.isEmpty(mDefaultRingtone2Filename)

                        || doesPathHaveFilename(entry.mPath, mDefaultRingtone2Filename)

                        || doesPathHaveFilename(entry.mPath, mDefaultRingtone2Filename)

                        || TextUtils.isEmpty(mDefaultRingtone3Filename)

                        || doesPathHaveFilename(entry.mPath, mDefaultRingtone3Filename);

                        || doesPathHaveFilename(entry.mPath, mDefaultRingtone3Filename);

            }

            }

            return result;

        }





        private boolean needToSetSettingsForAlarm(FileEntry entry) {

        private boolean needToSetSettingsForAlarm(FileEntry entry) {

            return TextUtils.isEmpty(mDefaultAlarmAlertFilename)

            return TextUtils.isEmpty(mDefaultAlarmAlertFilename)