Merge "Fix no ringtone and notification sound after MediaScan" (ece381c7) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaScanner.java

+23 −10

Original line number	Diff line number	Diff line
		@@ -1001,9 +1001,13 @@ public class MediaScanner
		// notifications, ringtones, and alarms, because the rowId of the inserted file is
		// needed.
		if (mWasEmptyPriorToScan) {
		needToSetSettings = needToSetSettingsForNotification(entry)
		\|\| needToSetSettingsForRingtone(entry)
		\|\| needToSetSettingsForAlarm(entry);
		if (notifications && !mDefaultNotificationSet) {
		needToSetSettings = needToSetSettingsForNotification(entry);
		} else if (ringtones && !mDefaultRingtoneSet) {
		needToSetSettings = needToSetSettingsForRingtone(entry);
		} else if (alarms && !mDefaultAlarmSet) {
		needToSetSettings = needToSetSettingsForAlarm(entry);
		}
		}

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

		private boolean needToSetSettingsForNotification(FileEntry entry) {
		return TextUtils.isEmpty(mDefaultNotificationFilename)
		\|\| doesPathHaveFilename(entry.mPath, mDefaultNotificationFilename)
		boolean result = TextUtils.isEmpty(mDefaultNotificationFilename)
		\|\| doesPathHaveFilename(entry.mPath, mDefaultNotificationFilename);
		if (isSoundCustomized()) {
		result = result \|\| TextUtils.isEmpty(mDefaultMmsNotificationFilename)
		\|\| doesPathHaveFilename(entry.mPath, mDefaultMmsNotificationFilename);
		}
		return result;
		}

		private boolean needToSetSettingsForRingtone(FileEntry entry) {
		return TextUtils.isEmpty(mDefaultRingtoneFilename)
		\|\| doesPathHaveFilename(entry.mPath, mDefaultRingtoneFilename)
		boolean result = TextUtils.isEmpty(mDefaultRingtoneFilename)
		\|\| doesPathHaveFilename(entry.mPath, mDefaultRingtoneFilename);
		if (isSoundCustomized()) {
		result = result \|\| TextUtils.isEmpty(mDefaultRingtone2Filename)
		\|\| doesPathHaveFilename(entry.mPath, mDefaultRingtone2Filename)
		\|\| TextUtils.isEmpty(mDefaultRingtone3Filename)
		\|\| doesPathHaveFilename(entry.mPath, mDefaultRingtone3Filename);
		}
		return result;
		}

		private boolean needToSetSettingsForAlarm(FileEntry entry) {
		return TextUtils.isEmpty(mDefaultAlarmAlertFilename)