Merge "RingtoneManager: allow video ringtone URI" into udc-qpr-dev (275ff2fe) · Commits · e / os / android_frameworks_base

media/java/android/media/RingtoneManager.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -924,9 +924,13 @@ public class RingtoneManager {
		+ " ignored: failure to find mimeType (no access from this context?)");
		return;
		}
		if (!(mimeType.startsWith("audio/") \|\| mimeType.equals("application/ogg"))) {
		if (!(mimeType.startsWith("audio/") \|\| mimeType.equals("application/ogg")
		\|\| mimeType.equals("application/x-flac")
		// also check for video ringtones
		\|\| mimeType.startsWith("video/") \|\| mimeType.equals("application/mp4"))) {
		Log.e(TAG, "setActualDefaultRingtoneUri for URI:" + ringtoneUri
		+ " ignored: associated mimeType:" + mimeType + " is not an audio type");
		+ " ignored: associated MIME type:" + mimeType
		+ " is not a recognized audio or video type");
		return;
		}
		}

+7 −4

Original line number	Diff line number	Diff line
		@@ -1985,7 +1985,7 @@ public class SettingsProvider extends ContentProvider {

		File cacheFile = getCacheFile(name, callingUserId);
		if (cacheFile != null) {
		if (!isValidAudioUri(name, value)) {
		if (!isValidMediaUri(name, value)) {
		return false;
		}
		// Invalidate any relevant cache files
		@@ -2046,7 +2046,7 @@ public class SettingsProvider extends ContentProvider {
		return true;
		}

		private boolean isValidAudioUri(String name, String uri) {
		private boolean isValidMediaUri(String name, String uri) {
		if (uri != null) {
		Uri audioUri = Uri.parse(uri);
		if (Settings.AUTHORITY.equals(
		@@ -2064,10 +2064,13 @@ public class SettingsProvider extends ContentProvider {
		return false;
		}
		if (!(mimeType.startsWith("audio/") \|\| mimeType.equals("application/ogg")
		\|\| mimeType.equals("application/x-flac"))) {
		\|\| mimeType.equals("application/x-flac")
		// also check for video ringtones
		\|\| mimeType.startsWith("video/") \|\| mimeType.equals("application/mp4"))) {
		Slog.e(LOG_TAG,
		"mutateSystemSetting for setting: " + name + " URI: " + audioUri
		+ " ignored: associated mimeType: " + mimeType + " is not an audio type");
		+ " ignored: associated MIME type: " + mimeType
		+ " is not a recognized audio or video type");
		return false;
		}
		}